diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
| commit | 40a1f69e8663fb79560c26cfad5ead45b1b3ee5f (patch) | |
| tree | a8ceb093a098a38b29c0fe27e41af480ae10b876 /mkspecs/integrity-x86/qmake.conf | |
| parent | 446afc10451d5097d7bd20b1b8d20325c4d54fa5 (diff) | |
| parent | 6b2071c697d4c48f0cd289b28b443ebffc3432e6 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure.json
mkspecs/macx-tvos-clang/qmake.conf
mkspecs/macx-watchos-clang/qmake.conf
Change-Id: Iaf32339ace59dff9ed344972472744c55d75025c
Diffstat (limited to 'mkspecs/integrity-x86/qmake.conf')
| -rw-r--r-- | mkspecs/integrity-x86/qmake.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mkspecs/integrity-x86/qmake.conf b/mkspecs/integrity-x86/qmake.conf index 4a5cfcc49d..13d4a6c082 100644 --- a/mkspecs/integrity-x86/qmake.conf +++ b/mkspecs/integrity-x86/qmake.conf @@ -5,7 +5,6 @@ include(../common/ghs-integrity-x86.conf) QMAKE_CFLAGS += -cpu=Corei -DEFINES += QT_NO_CLIPBOARD DEFINES += QT_STATICPLUGIN QTPLUGIN.platforms += integrityfb |