diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-17 10:53:42 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-17 10:53:42 +0200 |
commit | 3cb56800d581dabd18e354a24f018c55bd91f748 (patch) | |
tree | 9b8e95cf62e22026463a0f87a3625b279f457aad /tools/configure/configureapp.cpp | |
parent | aed7540d45096791d1a824f500694a15426fd94b (diff) | |
parent | 3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
Change-Id: If899cda251b4dc8b8a7c6764520e88ab719737cd
Diffstat (limited to 'tools/configure/configureapp.cpp')
-rw-r--r-- | tools/configure/configureapp.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 12efc67325..be11851910 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3313,11 +3313,6 @@ void Configure::generateQConfigPri() configStream << " QT_TARGET_ARCH = " << dictionary["QT_ARCH"] << endl; configStream << "} else {" << endl; configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; - if (dictionary.contains("XQMAKESPEC")) { - // FIXME: add detection - configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; - configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; - } configStream << "}" << endl; configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; |