From 6e61d1541c01789604d939635b1258195a82c4d0 Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Tue, 20 Aug 2013 19:29:03 -0500 Subject: [PATCH] Updates linux configure script to handle building for qt5 --- config.tests/qt4/qt4.pro | 2 +- configure | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config.tests/qt4/qt4.pro b/config.tests/qt4/qt4.pro index 3b16f00d..926c7cd0 100644 --- 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 diff --git a/configure b/configure index edfd080d..c00932df 100755 --- a/configure +++ b/configure @@ -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