diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-27 01:00:36 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-27 01:00:36 +0100 |
commit | ec5e692c1c4d8576d19723bb1193703275efdc90 (patch) | |
tree | 976b6844203d60d4bf0b4c65dcfaf8eba7621506 /mkspecs/integrity-armv7/qmake.conf | |
parent | f91d1e08099e67c77c8d7bcda362f07eec054ae8 (diff) | |
parent | ba13c6c08f30a4c2f188f69deeaf4ca6a020d7a1 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I04afffdce6b78856d0301eb583f21d334c7466b0
Diffstat (limited to 'mkspecs/integrity-armv7/qmake.conf')
-rw-r--r-- | mkspecs/integrity-armv7/qmake.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mkspecs/integrity-armv7/qmake.conf b/mkspecs/integrity-armv7/qmake.conf index 7a2ffaba14..002c8b544e 100644 --- a/mkspecs/integrity-armv7/qmake.conf +++ b/mkspecs/integrity-armv7/qmake.conf @@ -5,5 +5,3 @@ include(../common/ghs-integrity-armv7.conf) DEFINES += QT_STATICPLUGIN - -QTPLUGIN.platforms += integrityfb |