diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-10-26 13:06:39 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-26 07:31:02 +0200 |
commit | 6c7f668043e44218e2538dc0a453a43d9adf7e45 (patch) | |
tree | 6527ec2ac1b029fbeb78f2465f090ed295318efb | |
parent | 88087611ef6d0c4800de756a850496085c41c282 (diff) | |
download | qtscript-6c7f668043e44218e2538dc0a453a43d9adf7e45.tar.gz |
Fixed compile with -no-widgets
Disable tests which need QtWidgets when that module is not available.
Note that a missing QtWidgets also implies a missing QtScriptTools.
Change-Id: I59ae3c25cfebf24ec9f8418b78b8b9f8c1caa7e3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r-- | tests/auto/auto.pro | 8 | ||||
-rw-r--r-- | tests/auto/headersclean/tst_headersclean.cpp | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index b5936c0..1d4d614 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -23,4 +23,12 @@ SUBDIRS=\ qtipc \ qscriptengineagent +isEmpty(QT.widgets.name):SUBDIRS -= \ + qscriptable \ + qscriptengine \ + qscriptenginedebugger \ + qscriptextqobject \ + qscriptqwidgets \ + qscriptvalue + !cross_compile: SUBDIRS += host.pro diff --git a/tests/auto/headersclean/tst_headersclean.cpp b/tests/auto/headersclean/tst_headersclean.cpp index e964f30..facfa55 100644 --- a/tests/auto/headersclean/tst_headersclean.cpp +++ b/tests/auto/headersclean/tst_headersclean.cpp @@ -50,7 +50,10 @@ #include <QtTest/QtTest> #include <QtScript/QtScript> -#include <QtScriptTools/QtScriptTools> + +#ifdef QT_SCRIPTTOOLS_LIB +# include <QtScriptTools/QtScriptTools> +#endif class tst_HeadersClean: public QObject { |