Merged in jonesmz/libqxt-qt5-linux-configure (pull request #25)

Updates linux configure script to handle building for qt5
2013-08-22 23:59:36 +02:00 · 2013-08-22 23:59:36 +02:00 · f073edcc21
parent 7756bb4991 6e61d1541c
commit f073edcc21
2 changed files with 2 additions and 1 deletions
--- a/config.tests/qt4/qt4.pro
+++ b/config.tests/qt4/qt4.pro
@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = 
+TARGET = qt4
 DEPENDPATH += .
 INCLUDEPATH += .
 SOURCES += main.cpp
--- a/1
+++ b/1
@ -203,6 +203,7 @@ if [[ "$QXT_INSTALL_BINS" == "" ]]; then
 fi
 if [[ "$QXT_INSTALL_FEATURES" == "" ]]; then
    QXT_INSTALL_FEATURES=`$QMAKE_BIN -query QMAKE_MKSPECS`
+    [ "$QXT_INSTALL_FEATURES" == "**Unknown**" ] && QXT_INSTALL_FEATURES=`$QMAKE_BIN -query QT_HOST_DATA`/mkspecs
    QXT_INSTALL_FEATURES="$QXT_INSTALL_FEATURES/features"
 fi