diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-23 07:18:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-23 10:29:37 +0200 |
| commit | 5cfb80a28ef6bf6820c970a6c355e6879021e46e (patch) | |
| tree | e60f1f43e9670e82923e3c2d0d19b29198b9c300 /mkspecs/macx-g++ | |
| parent | 930e750b7aca024b839c9856cfcc79aab8c0abbc (diff) | |
| parent | f4be16e1f7828a0f6992ef2e20b9106177d7fc88 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/angle/src/libGLESv2/libGLESv2.pro
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
Change-Id: If8da4cfe8f57fea9f78e7239f378a6302c01674e
Diffstat (limited to 'mkspecs/macx-g++')
| -rw-r--r-- | mkspecs/macx-g++/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index dcc023e6c5..b0134f72e7 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -7,7 +7,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname +CONFIG += app_bundle incremental global_init_link_order lib_version_first QMAKE_INCREMENTAL_STYLE = sublib include(../common/macx.conf) |