From ed8e8734620221dbb5f96c6b590d46d876fd5b7d Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 16 Apr 2012 15:20:37 +0200
Subject: switch to new-style configure tests

Change-Id: I6e22f8b74d769315d635738dcdef038e61c80e0f
Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
---
 qtjsondb.pro                       | 4 ++++
 src/partition/partition.pro        | 2 +-
 sync.profile                       | 4 ----
 tests/auto/partition/partition.pro | 2 +-
 tools/tools.pro                    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/qtjsondb.pro b/qtjsondb.pro
index fade7dd7..62976bb5 100644
--- a/qtjsondb.pro
+++ b/qtjsondb.pro
@@ -1,3 +1,7 @@
+load(configure)
+qtCompileTest(icu)
+qtCompileTest(libedit)
+
 TEMPLATE = subdirs
 
 module_qtjsondb_src.subdir = src
diff --git a/src/partition/partition.pro b/src/partition/partition.pro
index 2cb9fced..4ef3f9d5 100644
--- a/src/partition/partition.pro
+++ b/src/partition/partition.pro
@@ -70,7 +70,7 @@ SOURCES += \
     jsondbquerytokenizer.cpp \
     jsondbqueryparser.cpp
 
-contains(config_test_icu, yes) {
+config_icu {
     LIBS += -licuuc -licui18n
 } else {
     DEFINES += NO_COLLATION_SUPPORT
diff --git a/sync.profile b/sync.profile
index 10a62c0a..72789c21 100644
--- a/sync.profile
+++ b/sync.profile
@@ -21,7 +21,3 @@ $publicclassregexp = "QJsonDb.+";
         "qtjsbackend" => "refs/heads/master",
         "qtxmlpatterns" => "refs/heads/master",
 );
-%configtests = (
-        "icu" => {},
-        "libedit" => {}
-);
diff --git a/tests/auto/partition/partition.pro b/tests/auto/partition/partition.pro
index ab693e55..c075828a 100644
--- a/tests/auto/partition/partition.pro
+++ b/tests/auto/partition/partition.pro
@@ -22,7 +22,7 @@ include(../../../src/hbtree/hbtree.pri)
 SOURCES += \
     testpartition.cpp \
 
-contains(config_test_icu, yes) {
+config_icu {
     LIBS += -licuuc -licui18n
 } else {
     DEFINES += NO_COLLATION_SUPPORT
diff --git a/tools/tools.pro b/tools/tools.pro
index 1da075af..341967d6 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-contains(config_test_libedit, yes):SUBDIRS += jsondb-client
+config_libedit:SUBDIRS += jsondb-client
-- 
cgit v1.2.3