summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qtjsondb.pri14
-rw-r--r--src/common/common.pri1
-rw-r--r--tests/auto/jsondb-listmodel/jsondb-listmodel.pro1
-rw-r--r--tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro1
-rw-r--r--tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro1
-rw-r--r--tests/benchmarks/jsondb-listmodel/jsondb-listmodel.pro1
-rw-r--r--tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro1
-rw-r--r--tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro1
-rw-r--r--tests/shared/shared.pri2
-rw-r--r--tools/jsondb-client/jsondb-client.pro2
10 files changed, 0 insertions, 25 deletions
diff --git a/qtjsondb.pri b/qtjsondb.pri
deleted file mode 100644
index 66bf37eb..00000000
--- a/qtjsondb.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-JSONDB_SOURCE_TREE = $$PWD
-
-testcocoon {
- # Add missing paths to instrument with code coverage which are used by different projects
- # within QtJsonDb. Headers files not located in the current directory are not detected
- # by the overall implementation which can break the instrumentation.
- TESTCOCOON_COVERAGE_JSONDB_OPTIONS = \
- --cs-include-file-abs-regex=\'^$$JSONDB_SOURCE_TREE[/\\\\]src[/\\\\].*\\.h\$\$\'
-
- QMAKE_CFLAGS += $$TESTCOCOON_COVERAGE_JSONDB_OPTIONS
- QMAKE_CXXFLAGS += $$TESTCOCOON_COVERAGE_JSONDB_OPTIONS
- QMAKE_LFLAGS = $$TESTCOCOON_COVERAGE_JSONDB_OPTIONS
- QMAKE_AR += $$TESTCOCOON_COVERAGE_JSONDB_OPTIONS
-}
diff --git a/src/common/common.pri b/src/common/common.pri
index f83959dc..7c0f7b83 100644
--- a/src/common/common.pri
+++ b/src/common/common.pri
@@ -1,6 +1,5 @@
INCLUDEPATH += $$PWD
-include(../../qtjsondb.pri)
include(../3rdparty/qjson/qjson.pri)
HEADERS += \
diff --git a/tests/auto/jsondb-listmodel/jsondb-listmodel.pro b/tests/auto/jsondb-listmodel/jsondb-listmodel.pro
index 1762cb24..b7c19aab 100644
--- a/tests/auto/jsondb-listmodel/jsondb-listmodel.pro
+++ b/tests/auto/jsondb-listmodel/jsondb-listmodel.pro
@@ -8,7 +8,6 @@ CONFIG -= app_bundle
CONFIG += testcase
include($$PWD/../../shared/shared.pri)
-include($$PWD/../../../qtjsondb.pri)
include($$PWD/../../../src/3rdparty/qjson/qjson.pri)
DEFINES += JSONDB_DAEMON_BASE=\\\"$$QT.jsondb.bins\\\"
diff --git a/tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro b/tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
index c483f8e3..7c07f7a3 100644
--- a/tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
+++ b/tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
@@ -8,7 +8,6 @@ CONFIG -= app_bundle
CONFIG += testcase
include($$PWD/../../shared/shared.pri)
-include($$PWD/../../../qtjsondb.pri)
include($$PWD/../../../src/3rdparty/qjson/qjson.pri)
DEFINES += JSONDB_DAEMON_BASE=\\\"$$QT.jsondb.bins\\\"
diff --git a/tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro b/tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro
index ddf678f8..513d35b2 100644
--- a/tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro
+++ b/tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro
@@ -8,7 +8,6 @@ CONFIG -= app_bundle
CONFIG += testcase
include($$PWD/../../shared/shared.pri)
-include($$PWD/../../../qtjsondb.pri)
include($$PWD/../../../src/3rdparty/qjson/qjson.pri)
DEFINES += JSONDB_DAEMON_BASE=\\\"$$QT.jsondb.bins\\\"
diff --git a/tests/benchmarks/jsondb-listmodel/jsondb-listmodel.pro b/tests/benchmarks/jsondb-listmodel/jsondb-listmodel.pro
index ba0cb08a..27aa6e33 100644
--- a/tests/benchmarks/jsondb-listmodel/jsondb-listmodel.pro
+++ b/tests/benchmarks/jsondb-listmodel/jsondb-listmodel.pro
@@ -5,7 +5,6 @@ QT = core network testlib gui declarative jsondbcompat-private
CONFIG -= app_bundle
include($$PWD/../../shared/shared.pri)
-include($$PWD/../../../qtjsondb.pri)
include($$PWD/../../../src/3rdparty/qjson/qjson.pri)
DEFINES += JSONDB_DAEMON_BASE=\\\"$$QT.jsondb.bins\\\"
diff --git a/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro b/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
index 75558964..114f94b2 100644
--- a/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
+++ b/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
@@ -8,7 +8,6 @@ CONFIG -= app_bundle
CONFIG += testcase
include($$PWD/../../shared/shared.pri)
-include($$PWD/../../../qtjsondb.pri)
include($$PWD/../../../src/3rdparty/qjson/qjson.pri)
DEFINES += JSONDB_DAEMON_BASE=\\\"$$QT.jsondb.bins\\\"
diff --git a/tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro b/tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro
index c6655da0..29aeeec2 100644
--- a/tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro
+++ b/tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro
@@ -8,7 +8,6 @@ CONFIG -= app_bundle
CONFIG += testcase
include($$PWD/../../shared/shared.pri)
-include($$PWD/../../../qtjsondb.pri)
include($$PWD/../../../src/3rdparty/qjson/qjson.pri)
DEFINES += JSONDB_DAEMON_BASE=\\\"$$QT.jsondb.bins\\\"
diff --git a/tests/shared/shared.pri b/tests/shared/shared.pri
index eba59a29..4f47a0bc 100644
--- a/tests/shared/shared.pri
+++ b/tests/shared/shared.pri
@@ -1,7 +1,5 @@
INCLUDEPATH += $$PWD
-include(../../qtjsondb.pri)
-
HEADERS += $$PWD/util.h $$PWD/qmltestutil.h
contains(QT, jsondbcompat|jsondbcompat-private) {
diff --git a/tools/jsondb-client/jsondb-client.pro b/tools/jsondb-client/jsondb-client.pro
index ca8cf34a..e529a98d 100644
--- a/tools/jsondb-client/jsondb-client.pro
+++ b/tools/jsondb-client/jsondb-client.pro
@@ -8,8 +8,6 @@ QT = core jsondb declarative gui
LIBS += -ledit
-include(../../qtjsondb.pri)
-
mac:CONFIG -= app_bundle
HEADERS += client.h