diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
| commit | dfc177e3a99dd593db4b1e9445d6243ce75ebf07 (patch) | |
| tree | 4e33c7be90a44642e672fff22ea163b500ff3aef /mkspecs/features/default_post.prf | |
| parent | 72efb2e6f4af2fd909daaf9104f09fd1425acfb0 (diff) | |
| parent | 1d6eb70dcec105af28d6a5e9b59d56c895c70389 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
qmake/library/qmakeevaluator.cpp
(cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools)
src/corelib/kernel/qcore_mac_objc.mm
src/gui/painting/qcolor.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31
Diffstat (limited to 'mkspecs/features/default_post.prf')
| -rw-r--r-- | mkspecs/features/default_post.prf | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index edc3cac7ba..e7e9a5bd87 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -116,29 +116,6 @@ c++11|c++14|c++1z { unset(cxxstd) } -suffix = -for(ever) { - QMAKE_USE$${suffix} = $$unique(QMAKE_USE$${suffix}) - for(name, QMAKE_USE$${suffix}) { - nu = $$upper($$name) - CONFIG(debug, debug|release): \ - libs = $$eval(QMAKE_LIBS_$${nu}_DEBUG) - else: \ - libs = $$eval(QMAKE_LIBS_$${nu}_RELEASE) - libs += $$eval(QMAKE_LIBS_$$nu) - cflags = $$eval(QMAKE_CFLAGS_$${nu}) - - isEmpty(libs):isEmpty(cflags): \ - error("Library '$$name' is not defined.") - - LIBS$${suffix} += $$libs - QMAKE_CFLAGS += $$cflags - QMAKE_CXXFLAGS += $$cflags - } - !isEmpty(suffix): break() - suffix = "_PRIVATE" -} - !precompile_header: SOURCES += $$NO_PCH_SOURCES QMAKE_INCDIR += $$QMAKE_INCDIR_POST |