diff options
| -rw-r--r-- | modules/qt_bluetooth.pri | 17 | ||||
| -rw-r--r-- | modules/qt_nfc.pri | 19 | ||||
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 4 | ||||
| -rw-r--r-- | src/nfc/nfc.pro | 2 | ||||
| -rw-r--r-- | sync.profile | 4 |
5 files changed, 2 insertions, 44 deletions
diff --git a/modules/qt_bluetooth.pri b/modules/qt_bluetooth.pri deleted file mode 100644 index 01531567..00000000 --- a/modules/qt_bluetooth.pri +++ /dev/null @@ -1,17 +0,0 @@ -QT.bluetooth.VERSION = 5.0.0 -QT.bluetooth.MAJOR_VERSION = 5 -QT.bluetooth.MINOR_VERSION = 0 -QT.bluetooth.PATCH_VERSION = 0 - -QT.bluetooth.name = QtBluetooth -QT.bluetooth.bins = $$QT_MODULE_BIN_BASE -QT.bluetooth.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtBluetooth -QT.bluetooth.private_includes = $$QT_MODULE_INCLUDE_BASE/QtBluetooth/$$QT.bluetooth.VERSION -QT.bluetooth.sources = $$QT_MODULE_BASE/src/bluetooth -QT.bluetooth.libs = $$QT_MODULE_LIB_BASE -QT.bluetooth.plugins = $$QT_MODULE_PLUGIN_BASE -QT.bluetooth.imports = $$QT_MODULE_IMPORT_BASE -QT.bluetooth.depends = core concurrent -QT.bluetooth.DEFINES = QT_BLUETOOTH_LIB - -QT_CONFIG += bluetooth diff --git a/modules/qt_nfc.pri b/modules/qt_nfc.pri deleted file mode 100644 index 5d07df1b..00000000 --- a/modules/qt_nfc.pri +++ /dev/null @@ -1,19 +0,0 @@ -# QT NFC disabled - -#QT.nfc.VERSION = 5.0.0 -#QT.nfc.MAJOR_VERSION = 5 -#QT.nfc.MINOR_VERSION = 0 -#QT.nfc.PATCH_VERSION = 0 -# -#QT.nfc.name = QtNfc -#QT.nfc.bins = $$QT_MODULE_BIN_BASE -#QT.nfc.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtNfc -#QT.nfc.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNfc/$$QT.nfc.VERSION -#QT.nfc.sources = $$QT_MODULE_BASE/src/nfc -#QT.nfc.libs = $$QT_MODULE_LIB_BASE -#QT.nfc.plugins = $$QT_MODULE_PLUGIN_BASE -#QT.nfc.imports = $$QT_MODULE_IMPORT_BASE -#QT.nfc.depends = core -#QT.nfc.DEFINES = QT_NFC_LIB -# -#QT_CONFIG += nfc diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 802bafcd..feabe6ed 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -4,14 +4,14 @@ TARGET = QtBluetooth QPRO_PWD = $PWD CONFIG += module -MODULE_PRI = ../../modules/qt_bluetooth.pri +QT = core DEFINES += QT_BUILD_BT_LIB QT_MAKEDLL load(qt_module_config) +# private dependencies QT += concurrent -QT -= gui PUBLIC_HEADERS += \ qbluetoothaddress.h\ diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index d3964406..1d8aeb09 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -4,8 +4,6 @@ TARGET = QtNfc QPRO_PWD = $PWD CONFIG += module -MODULE_PRI = ../../modules/qt_nfc.pri - QT = core DEFINES += QT_BUILD_NFC_LIB QT_MAKEDLL diff --git a/sync.profile b/sync.profile index 91eb21c7..612cd263 100644 --- a/sync.profile +++ b/sync.profile @@ -12,10 +12,6 @@ "bluetooth" => "#include <QtBluetooth/QtBluetooth>\n", # "nfc" => "#include <QtNfc/QtNfc>\n", ); -%modulepris = ( - "QtBluetooth" => "$basedir/modules/qt_bluetooth.pri", -# "QtNfc" => "$basedir/modules/qt_nfc.pri", -); # 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: |