summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-12 12:52:05 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-26 03:22:58 +0200
commit690a6ca3696e1cfb0b73214cb147501f28e45416 (patch)
treefb25b0b561a07a5ea3b4d300de189a2dee005094
parent2efdf1be0f8e9e1537e1f92e67c0a92e52b8d2d5 (diff)
build system cleanups
- load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless DEFINES+=QT_MAKEDLL - pointless and commented out include and depend paths Change-Id: If3325fecb675c9b439de89c26b5b53da10d66fb9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
-rw-r--r--src/bluetooth/bluetooth.pro10
-rw-r--r--src/nfc/nfc.pro9
-rw-r--r--sync.profile8
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: