diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-05 14:46:23 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 07:53:16 +0200 |
| commit | cd18427c6624d40a8771c15ae284916bd7169201 (patch) | |
| tree | 4df449fa22c2520d6e203ae064a8229f949f5215 | |
| parent | b90799e1779b8bb9347daebdac071db5bd05bddb (diff) | |
switch to new-style configure tests
Change-Id: I74e506c6de49631e692eb8efda64083ba319127e
Reviewed-by: Alex <alex.blasche@nokia.com>
| -rw-r--r-- | qtconnectivity.pro | 3 | ||||
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 2 | ||||
| -rw-r--r-- | sync.profile | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/qtconnectivity.pro b/qtconnectivity.pro index d7df2578..de9c362a 100644 --- a/qtconnectivity.pro +++ b/qtconnectivity.pro @@ -1,3 +1,6 @@ +load(configure) +qtCompileTest(bluez) + TEMPLATE = subdirs CONFIG += ordered diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index feabe6ed..d10653f3 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -62,7 +62,7 @@ SOURCES += \ qbluetoothtransferrequest.cpp \ qbluetoothtransferreply.cpp -contains(config_test_bluez, yes):contains(QT_CONFIG, dbus) { +config_bluez:contains(QT_CONFIG, dbus) { QT *= dbus DEFINES += QT_BLUEZ_BLUETOOTH diff --git a/sync.profile b/sync.profile index 612cd263..ae948177 100644 --- a/sync.profile +++ b/sync.profile @@ -25,8 +25,3 @@ "qtsystems" => "refs/heads/master", "qtxmlpatterns" => "refs/heads/master", ); - -# Compile tests -%configtests = ( - "bluez" => {}, -); |