qtdeclarative: Fix build with tests enabled
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
6ec8824564
commit
1279a21d9d
|
@ -1,4 +1,4 @@
|
||||||
From 6e3f95ab76c4de1333eab1625b507c09ad52d340 Mon Sep 17 00:00:00 2001
|
From 64ca7961376fa896d82c2a3db2d42cbb6b68c069 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
|
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
|
||||||
Date: Sun, 26 May 2013 14:26:19 +0200
|
Date: Sun, 26 May 2013 14:26:19 +0200
|
||||||
Subject: [PATCH 1/2] qmltestexample: fix link
|
Subject: [PATCH 1/2] qmltestexample: fix link
|
||||||
|
@ -11,10 +11,16 @@ ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found
|
||||||
|
|
||||||
Upstream-Status: Inappropriate
|
Upstream-Status: Inappropriate
|
||||||
|
|
||||||
|
Change-Id: I63088ff73bec6a8559dfae132f8bd40b62487450
|
||||||
Signed-off-by: Eric Bénard <eric@eukrea.com>
|
Signed-off-by: Eric Bénard <eric@eukrea.com>
|
||||||
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
---
|
---
|
||||||
examples/qmltest/qmltest/qmltest.pro | 2 +-
|
examples/qmltest/qmltest/qmltest.pro | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
tests/auto/qml/qjsengine/qjsengine.pro | 2 +-
|
||||||
|
tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | 2 +-
|
||||||
|
tests/auto/qmltest/qmltest.pro | 1 +
|
||||||
|
tools/qmltestrunner/qmltestrunner.pro | 2 +-
|
||||||
|
5 files changed, 5 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
|
diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
|
||||||
index b5893c5..1b00e6c 100644
|
index b5893c5..1b00e6c 100644
|
||||||
|
@ -29,15 +35,52 @@ index b5893c5..1b00e6c 100644
|
||||||
|
|
||||||
macx: CONFIG -= app_bundle
|
macx: CONFIG -= app_bundle
|
||||||
|
|
||||||
|
diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro
|
||||||
|
index a62eb75..73b6917 100644
|
||||||
|
--- a/tests/auto/qml/qjsengine/qjsengine.pro
|
||||||
|
+++ b/tests/auto/qml/qjsengine/qjsengine.pro
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
CONFIG += testcase
|
||||||
|
CONFIG += parallel_test
|
||||||
|
TARGET = tst_qjsengine
|
||||||
|
-QT += qml qml-private widgets testlib gui-private
|
||||||
|
+QT += qml qml-private widgets testlib gui-private quick
|
||||||
|
macx:CONFIG -= app_bundle
|
||||||
|
SOURCES += tst_qjsengine.cpp
|
||||||
|
|
||||||
|
diff --git a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro
|
||||||
|
index c6d442e..3181dcd 100644
|
||||||
|
--- a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro
|
||||||
|
+++ b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro
|
||||||
|
@@ -8,5 +8,5 @@ macx:CONFIG -= app_bundle
|
||||||
|
|
||||||
|
TESTDATA = data/*
|
||||||
|
|
||||||
|
-QT += core-private qml-private testlib gui gui-private
|
||||||
|
+QT += core-private qml-private testlib gui gui-private quick
|
||||||
|
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
||||||
|
diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
|
||||||
|
index 7662cb1..a8f8ae2 100644
|
||||||
|
--- a/tests/auto/qmltest/qmltest.pro
|
||||||
|
+++ b/tests/auto/qmltest/qmltest.pro
|
||||||
|
@@ -4,6 +4,7 @@ CONFIG += qmltestcase
|
||||||
|
CONFIG += console
|
||||||
|
SOURCES += tst_qmltest.cpp
|
||||||
|
|
||||||
|
+QT += quick
|
||||||
|
|
||||||
|
importFiles.files = borderimage buttonclick createbenchmark events qqmlbinding selftests
|
||||||
|
|
||||||
diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
|
diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
|
||||||
index 5184c1f..668cf17 100644
|
index 1bb913e..56f2dd5 100644
|
||||||
--- a/tools/qmltestrunner/qmltestrunner.pro
|
--- a/tools/qmltestrunner/qmltestrunner.pro
|
||||||
+++ b/tools/qmltestrunner/qmltestrunner.pro
|
+++ b/tools/qmltestrunner/qmltestrunner.pro
|
||||||
@@ -1,5 +1,5 @@
|
@@ -1,6 +1,6 @@
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
|
|
||||||
-QT += qml qmltest
|
-QT += qml qmltest
|
||||||
+QT += qml qmltest quick
|
+QT += qml qmltest quick
|
||||||
|
CONFIG += no_import_scan
|
||||||
|
|
||||||
load(qt_tool)
|
load(qt_tool)
|
||||||
--
|
--
|
||||||
|
|
Loading…
Reference in New Issue