diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-05-07 11:54:17 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-05-12 09:10:18 +0000 |
commit | 03ae6ad8e9aa73d77ce3caa89d9cebc2179e199a (patch) | |
tree | 467055b02eb6f493b6fa04f53bab5ee94211a251 /tools/configure/configureapp.cpp | |
parent | 6ea636b0bd73f067c08217aa4e0ccc3f0209ede0 (diff) |
remove $INCLUDE/$LIB hack for mingw
mingw is not msvc, and nobody in their right mind would expect it to
behave like it.
[ChangeLog][Important Behavior Changes][qmake] Qt configure and qmake
used with a MinGW spec will no longer emulate MSVC by picking up the
INCLUDE and LIB environment variables. Use the -I/-L configure options
to pass additional paths, as you would under Unix.
Change-Id: I533bb97de34d14dcbd45e0416283a79f44096c67
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tools/configure/configureapp.cpp')
-rw-r--r-- | tools/configure/configureapp.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 8ea5b2ed3b..08ec943563 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3042,16 +3042,6 @@ void Configure::generateOutputVars() if (!qmakeStylePlugins.isEmpty()) qmakeVars += QString("style-plugins += ") + qmakeStylePlugins.join(' '); - if (dictionary["QMAKESPEC"].endsWith("-g++")) { - QString includepath = qgetenv("INCLUDE"); - const bool hasSh = !QStandardPaths::findExecutable(QStringLiteral("sh.exe")).isEmpty(); - QChar separator = (!includepath.contains(":\\") && hasSh ? QChar(':') : QChar(';')); - qmakeVars += QString("TMPPATH = $$quote($$(INCLUDE))"); - qmakeVars += QString("QMAKE_INCDIR_POST += $$split(TMPPATH,\"%1\")").arg(separator); - qmakeVars += QString("TMPPATH = $$quote($$(LIB))"); - qmakeVars += QString("QMAKE_LIBDIR_POST += $$split(TMPPATH,\"%1\")").arg(separator); - } - if (!dictionary[ "QMAKESPEC" ].length()) { cout << "Configure could not detect your compiler. QMAKESPEC must either" << endl << "be defined as an environment variable, or specified as an" << endl |