diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-01 20:05:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-16 10:34:46 +0100 |
| commit | d0af156930f80c7133b0190765d21b12a3d4a76a (patch) | |
| tree | 73928f2519f3ebb63133a9cf1c7582d12f041578 /tests/auto | |
| parent | 10c9f850c1654c893e4784c4faaefb100830d7bd (diff) | |
optionally bootstrap QmlDevTools and qmlmin
QmlDevTools is really meant for host tools (the two only ones using this
being qmlmin in this repo and lupdate in qttools). qmake magic will take
care of bootstrapping them while x-building.
Change-Id: I29d921af483659d5455be0ad080dc1a88540c036
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/headersclean/headersclean.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qmldevtools/compile/compile.pro | 9 | ||||
| -rw-r--r-- | tests/auto/qmldevtools/compile/tst_compile.cpp | 15 |
3 files changed, 10 insertions, 16 deletions
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index 4457fe1c38..2698d67124 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,2 +1,2 @@ -QT = qml quick qmltest qmldevtools +QT = qml quick qmltest load(qt_headersclean) diff --git a/tests/auto/qmldevtools/compile/compile.pro b/tests/auto/qmldevtools/compile/compile.pro index ffe0778763..1c65daf909 100644 --- a/tests/auto/qmldevtools/compile/compile.pro +++ b/tests/auto/qmldevtools/compile/compile.pro @@ -1,9 +1,12 @@ -CONFIG += testcase +option(host_build) TARGET = tst_compile -QT = core qmldevtools-private testlib +force_bootstrap: \ + QT = bootstrap-private +else: \ + QT = core +QT += qmldevtools-private macx:CONFIG -= app_bundle SOURCES += tst_compile.cpp -CONFIG += parallel_test DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qmldevtools/compile/tst_compile.cpp b/tests/auto/qmldevtools/compile/tst_compile.cpp index ad63922763..6b13d1b4bb 100644 --- a/tests/auto/qmldevtools/compile/tst_compile.cpp +++ b/tests/auto/qmldevtools/compile/tst_compile.cpp @@ -38,7 +38,6 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <qtest.h> #include <private/qqmljsengine_p.h> #include <private/qqmljslexer_p.h> @@ -46,17 +45,9 @@ #include <private/qqmljsastvisitor_p.h> #include <private/qqmljsast_p.h> -class tst_compile : public QObject +int main() { - Q_OBJECT -public: - tst_compile() { } - -private slots: // Nothing - this test just makes sure that the QmlDevTools headers // are present, and that we can link against the library. -}; - -QTEST_MAIN(tst_compile) - -#include "tst_compile.moc" + return 0; +} |