aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/api
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-11-24 23:52:58 -0800
committerJake Petroules <jake.petroules@qt.io>2017-11-27 18:30:07 +0000
commit602ec12826f3b5522831b791efcbcddb2dfa8ed6 (patch)
tree25430bc1193c1fc160e034764a2207431418efaf /tests/auto/api
parentdcb93231197a67ca5abd3244cc8dbf2165064fc1 (diff)
Remove Qt dependency from some API tests
The Qt dependency in these tests does not seem to serve any purpose. This fixes the listBuildSystemFiles, subProjects, and precompiled header new row of the buildProject, buildProjectDryRun, resolveProject, and resolveProjectDryRun tests. Change-Id: Id9d3373ec449c0e80f944324472eebeaf0410f34 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/api')
-rw-r--r--tests/auto/api/testdata/precompiled-header-new/myobject.h5
-rw-r--r--tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs2
-rw-r--r--tests/auto/api/testdata/subprojects/resources/modules/QtCoreDepender/qtcoredepender.qbs2
-rw-r--r--tests/auto/api/testdata/subprojects/resources/modules/cute/core/core.qbs6
-rw-r--r--tests/auto/api/testdata/subprojects/resources/modules/cute/core/cuteglobal.h1
-rw-r--r--tests/auto/api/testdata/subprojects/subproject2/subproject3/subproject3.qbs2
-rw-r--r--tests/auto/api/testdata/subprojects/subproject2/subproject3/testlib.cpp2
7 files changed, 12 insertions, 8 deletions
diff --git a/tests/auto/api/testdata/precompiled-header-new/myobject.h b/tests/auto/api/testdata/precompiled-header-new/myobject.h
index a84536002..88d234c11 100644
--- a/tests/auto/api/testdata/precompiled-header-new/myobject.h
+++ b/tests/auto/api/testdata/precompiled-header-new/myobject.h
@@ -29,11 +29,8 @@
#ifndef MYOBJECT_H
#define MYOBJECT_H
-#include <QtCore/QObject>
-
-class MyObject : public QObject
+class MyObject
{
- Q_OBJECT
public:
MyObject();
~MyObject();
diff --git a/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs b/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs
index e556a745b..bb82ed248 100644
--- a/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs
+++ b/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs
@@ -1,6 +1,6 @@
import qbs 1.0
-QtApplication {
+CppApplication {
name: "MyApp"
consoleApplication: true
Group {
diff --git a/tests/auto/api/testdata/subprojects/resources/modules/QtCoreDepender/qtcoredepender.qbs b/tests/auto/api/testdata/subprojects/resources/modules/QtCoreDepender/qtcoredepender.qbs
index 03d649309..328abaa99 100644
--- a/tests/auto/api/testdata/subprojects/resources/modules/QtCoreDepender/qtcoredepender.qbs
+++ b/tests/auto/api/testdata/subprojects/resources/modules/QtCoreDepender/qtcoredepender.qbs
@@ -1,5 +1,5 @@
import qbs
Module {
- Depends { name: "Qt.core" }
+ Depends { name: "cute.core" }
}
diff --git a/tests/auto/api/testdata/subprojects/resources/modules/cute/core/core.qbs b/tests/auto/api/testdata/subprojects/resources/modules/cute/core/core.qbs
new file mode 100644
index 000000000..6ad30f229
--- /dev/null
+++ b/tests/auto/api/testdata/subprojects/resources/modules/cute/core/core.qbs
@@ -0,0 +1,6 @@
+import qbs
+
+Module {
+ Depends { name: "cpp" }
+ cpp.includePaths: [path]
+}
diff --git a/tests/auto/api/testdata/subprojects/resources/modules/cute/core/cuteglobal.h b/tests/auto/api/testdata/subprojects/resources/modules/cute/core/cuteglobal.h
new file mode 100644
index 000000000..b9649127b
--- /dev/null
+++ b/tests/auto/api/testdata/subprojects/resources/modules/cute/core/cuteglobal.h
@@ -0,0 +1 @@
+#define Q_DECL_EXPORT
diff --git a/tests/auto/api/testdata/subprojects/subproject2/subproject3/subproject3.qbs b/tests/auto/api/testdata/subprojects/subproject2/subproject3/subproject3.qbs
index acdf1d7e6..58a09e863 100644
--- a/tests/auto/api/testdata/subprojects/subproject2/subproject3/subproject3.qbs
+++ b/tests/auto/api/testdata/subprojects/subproject2/subproject3/subproject3.qbs
@@ -11,6 +11,6 @@ Project {
Depends { name: "QtCoreDepender" }
cpp.defines: "MY_EXPORT=Q_DECL_EXPORT"
files: "testlib.cpp"
- Export { Depends { name: "Qt.core" } }
+ Export { Depends { name: "cute.core" } }
}
}
diff --git a/tests/auto/api/testdata/subprojects/subproject2/subproject3/testlib.cpp b/tests/auto/api/testdata/subprojects/subproject2/subproject3/testlib.cpp
index dd573736f..05dd46aef 100644
--- a/tests/auto/api/testdata/subprojects/subproject2/subproject3/testlib.cpp
+++ b/tests/auto/api/testdata/subprojects/subproject2/subproject3/testlib.cpp
@@ -26,6 +26,6 @@
**
****************************************************************************/
-#include <QtGlobal>
+#include <cuteglobal.h>
MY_EXPORT void f() {}