diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-12 16:06:39 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-25 16:51:09 +0000 |
| commit | 6b2f3cbde61a6c5d0293500ceac1c6b69eecc013 (patch) | |
| tree | 6ec996a4360e20e4acf5f15f0d4283d53357f83d | |
| parent | c87458961f29064ab69a308526b0243debcdf1f7 (diff) | |
consistently put {qt,qml}_{module,plugin} at the end of project files
this fixes static builds by ensuring that all dependencies are exported.
Task-number: QTBUG-51071
Change-Id: I3cdb59c65dbbf2b536ee927dd912349b4ceca335
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 3 | ||||
| -rw-r--r-- | src/nfc/nfc.pro | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 6cf0795c..e6b61eb9 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -6,8 +6,6 @@ QT_PRIVATE = concurrent QMAKE_DOCS = $$PWD/doc/qtbluetooth.qdocconf OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator -load(qt_module) - PUBLIC_HEADERS += \ qbluetoothglobal.h \ qbluetoothaddress.h\ @@ -198,3 +196,4 @@ OTHER_FILES += HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS +load(qt_module) diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index 16737e73..a0a249fc 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -1,8 +1,6 @@ TARGET = QtNfc QT = core -load(qt_module) - QMAKE_DOCS = $$PWD/doc/qtnfc.qdocconf OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator @@ -153,3 +151,5 @@ isEmpty(NFC_BACKEND_AVAILABLE) { } HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +load(qt_module) |