summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Kallai <kadam@inf.u-szeged.hu>2013-10-15 03:41:15 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-16 14:45:29 +0200
commitd9276b51c64c2b0b1cd97dcd02c0a83e78018f81 (patch)
tree1fe97d715b771c010e1ab1cac9e8768e1bcf80ad
parent9ef84306531f3f146aeff2bed76a859d5a1ba38d (diff)
Build fix for the Widgets tests can be running by make check.
Change-Id: Ic5ec80679f19235f441108e99e06d489ff2cabc3 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--qtwebengine.pro5
-rw-r--r--tests/auto/auto.pro4
-rw-r--r--tests/tests.pro3
3 files changed, 9 insertions, 3 deletions
diff --git a/qtwebengine.pro b/qtwebengine.pro
index 5db155c26..e8a2c5754 100644
--- a/qtwebengine.pro
+++ b/qtwebengine.pro
@@ -16,11 +16,8 @@ SUBDIRS = build/qmake_extras \ # Phony pro file that extracts things like compil
qtHaveModule(widgets) {
SUBDIRS += \
lib/widgets \
- tests/widgets
}
-SUBDIRS += examples
-
# Ninja executable location needs to be determined early for extra targets. Should be fetched from cache most of the time anyway.
NINJA_EXECUTABLE = $$findOrBuildNinja()
@@ -35,3 +32,5 @@ debug.depends: qmake
QMAKE_EXTRA_TARGETS += release \
debug
+
+load(qt_parts)
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
new file mode 100644
index 000000000..30f0cbb03
--- /dev/null
+++ b/tests/auto/auto.pro
@@ -0,0 +1,4 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+ widgets
+
diff --git a/tests/tests.pro b/tests/tests.pro
new file mode 100644
index 000000000..42fe80815
--- /dev/null
+++ b/tests/tests.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+SUBDIRS += auto
+