diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-07-30 09:59:24 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-30 09:53:19 +0200 |
| commit | 3dc36ccf4ebaec07845263a2fbc90519604d333d (patch) | |
| tree | 3807955ded5dd579d1bfdbae9fef9cd535339f45 | |
| parent | 4547d8fa309c403f61ba32ef87475052fde4f523 (diff) | |
| download | qtscript-3dc36ccf4ebaec07845263a2fbc90519604d333d.tar.gz | |
Fixed compile without QtWidgets, unify "is module available?" syntax
If QtWidgets is not available, disable a few examples which need it.
Standardize on isEmpty(QT.widgets.name) in preference to
contains(QT_CONFIG,no-widgets).
Change-Id: I00335149a75911dd4ab42a4ce659889d548a8be3
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
| -rw-r--r-- | examples/script/script.pro | 6 | ||||
| -rw-r--r-- | src/src.pro | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/examples/script/script.pro b/examples/script/script.pro index a12d750..9e66a61 100644 --- a/examples/script/script.pro +++ b/examples/script/script.pro @@ -7,6 +7,12 @@ SUBDIRS = customclass symbian: SUBDIRS = context2d +isEmpty(QT.widgets.name):SUBDIRS -= \ + context2d \ + defaultprototypes \ + helloscript \ + qscript + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS script.pro README diff --git a/src/src.pro b/src/src.pro index 926c09e..f9d8b19 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS += script -!contains(QT_CONFIG, no-widgets): SUBDIRS += scripttools +!isEmpty(QT.widgets.name): SUBDIRS += scripttools |