diff options
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 10 | ||||
| -rw-r--r-- | src/nfc/nfc.pro | 9 | ||||
| -rw-r--r-- | sync.profile | 8 |
3 files changed, 2 insertions, 25 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index da738cd0..c838fec7 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -1,13 +1,8 @@ -load(qt_module) +load(qt_build_config) TARGET = QtBluetooth -QPRO_PWD = $PWD - -CONFIG += module QT = core -DEFINES += QT_BUILD_BLUETOOTH_LIB QT_MAKEDLL - load(qt_module_config) # private dependencies @@ -107,9 +102,6 @@ config_bluez:contains(QT_CONFIG, dbus) { } -INCLUDEPATH += $$PWD -INCLUDEPATH += .. - OTHER_FILES += HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index 1d8aeb09..1fc378dc 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -1,13 +1,8 @@ -load(qt_module) +load(qt_build_config) TARGET = QtNfc -QPRO_PWD = $PWD - -CONFIG += module QT = core -DEFINES += QT_BUILD_NFC_LIB QT_MAKEDLL - load(qt_module_config) PUBLIC_HEADERS += \ @@ -139,6 +134,4 @@ isEmpty(NFC_BACKEND_AVAILABLE) { qnearfieldmanagerimpl_p.cpp } -INCLUDEPATH += $$PWD - HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS diff --git a/sync.profile b/sync.profile index ae948177..604a1cf7 100644 --- a/sync.profile +++ b/sync.profile @@ -4,14 +4,6 @@ ); %moduleheaders = ( # restrict the module headers to those found in relative path ); -%classnames = ( - "qtbluetoothversion.h" => "QtBluetoothVersion", -# "qtnfcversion.h" => "QtNfcVersion", -); -%mastercontent = ( - "bluetooth" => "#include <QtBluetooth/QtBluetooth>\n", -# "nfc" => "#include <QtNfc/QtNfc>\n", -); # Module dependencies. # Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: |