diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
| commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
| tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /mkspecs/common | |
| parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
| parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/ghs-base.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/ghs-base.conf b/mkspecs/common/ghs-base.conf index bd1f3eb5ab..addc05241c 100644 --- a/mkspecs/common/ghs-base.conf +++ b/mkspecs/common/ghs-base.conf @@ -39,4 +39,4 @@ QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_LFLAGS_RELEASE -g QMAKE_LFLAGS_CXX11 += --c++11 --thread_local_storage QMAKE_LFLAGS_EXCEPTIONS_ON += --exceptions -QMAKE_LIBS_CORE = -lposix -livfs -lsocket -lnet -ldl +QMAKE_LIBS_CORE = -lposix -livfs -lsocket -lnet -lshm_client |