diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-16 12:25:24 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-16 12:25:24 +0000 |
| commit | 3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (patch) | |
| tree | 84bb5a5f766ce04ff4d243a38ce5e408db5e7782 /tools | |
| parent | 874eb8b44b3ca9cfab63372af10886d16dfc327d (diff) | |
| parent | c4e472ea1037afde7b99d9132a49eb616cad240e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7.0' into 5.7" into refs/staging/5.7
Diffstat (limited to 'tools')
| -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 395c4a0b54..cd2fd54b1d 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3508,11 +3508,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; |