diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-22 11:08:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-22 21:19:57 +0200 |
| commit | 28628a5d5e6c55512759ceafc644aa31e444b781 (patch) | |
| tree | 221d1ab0995afe0d441f1ddb433aee985f6d41ea /config.tests | |
| parent | cbb2ba23e203374132e4b134b1c8f1a3626d2378 (diff) | |
| parent | 686c44a69b13f6e884dd2b6d9991f4cd94597c5a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/eglfs/qeglfshooks.cpp
Change-Id: I483f0dbd876943b184803f0fe65a0c686ad75db2
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/.qmake.conf | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/config.tests/.qmake.conf b/config.tests/.qmake.conf index 71e6817656..e8f6f09e9d 100644 --- a/config.tests/.qmake.conf +++ b/config.tests/.qmake.conf @@ -1,6 +1 @@ -mingw { - TMPPATH = $$(INCLUDE) - QMAKE_INCDIR_POST += $$split(TMPPATH, $$QMAKE_DIRLIST_SEP) - TMPPATH = $$(LIB) - QMAKE_LIBDIR_POST += $$split(TMPPATH, $$QMAKE_DIRLIST_SEP) -} +# This file exists only to detach the tests from the surroundings. |