From 2f1eac5f35466ee257eb5d4a61aa3a837d53b82a Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 3 Dec 2012 21:45:04 +0100
Subject: remove symbian vestiges

Change-Id: Id4cf97c6ca3b9d4335daf4f32842fb07f51c557e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 examples/script/script.pro | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'examples/script/script.pro')

diff --git a/examples/script/script.pro b/examples/script/script.pro
index 9e66a61..ef0ab01 100644
--- a/examples/script/script.pro
+++ b/examples/script/script.pro
@@ -5,8 +5,6 @@ SUBDIRS = customclass
 !wince*:!contains(QT_CONFIG, no-gui):SUBDIRS += qscript marshal
 !wince*:SUBDIRS *= marshal
 
-symbian: SUBDIRS = context2d
-
 isEmpty(QT.widgets.name):SUBDIRS -= \
     context2d \
     defaultprototypes \
@@ -19,5 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS script.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
-- 
cgit v1.2.1


From 8a8112429cafaa8532ae4ec5cb711990604de485 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@digia.com>
Date: Tue, 4 Dec 2012 16:52:37 +0100
Subject: centralize and fixup example sources install targets

This follows suit with aeb036e in qtbase.

Change-Id: I695c3f7c69cfe811ffe05f7cb381e3216b76e7a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
---
 examples/script/script.pro | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

(limited to 'examples/script/script.pro')

diff --git a/examples/script/script.pro b/examples/script/script.pro
index ef0ab01..245824c 100644
--- a/examples/script/script.pro
+++ b/examples/script/script.pro
@@ -1,20 +1,29 @@
 TEMPLATE = subdirs
-SUBDIRS = customclass
-!contains(QT_CONFIG, no-gui):SUBDIRS += helloscript context2d defaultprototypes
+SUBDIRS = \
+    customclass \
+    qsdbg
 
-!wince*:!contains(QT_CONFIG, no-gui):SUBDIRS += qscript marshal
-!wince*:SUBDIRS *= marshal
+!isEmpty(QT.widgets.name) {
+    SUBDIRS += \
+        helloscript \
+        context2d \
+        defaultprototypes
 
-isEmpty(QT.widgets.name):SUBDIRS -= \
-    context2d \
-    defaultprototypes \
-    helloscript \
-    qscript
+    !isEmpty(QT.uitools.name) {
+        SUBDIRS += \
+            calculator \
+            qstetrix
+    }
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS script.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script
-INSTALLS += target sources
+    !wince {
+        SUBDIRS += \
+            qscript
+    }
+}
+
+!wince {
+    SUBDIRS += \
+        marshal
+}
 
 maemo5: CONFIG += qt_example
-- 
cgit v1.2.1


From b29abba55166b12d9ce6d599696398845b115d90 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 21 Dec 2012 11:00:42 +0100
Subject: make use of qtHaveModule()

Change-Id: I440b609d23570293f21f21a2cb31854366d06bf7
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 examples/script/script.pro | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples/script/script.pro')

diff --git a/examples/script/script.pro b/examples/script/script.pro
index 245824c..3e1eae6 100644
--- a/examples/script/script.pro
+++ b/examples/script/script.pro
@@ -3,13 +3,13 @@ SUBDIRS = \
     customclass \
     qsdbg
 
-!isEmpty(QT.widgets.name) {
+qtHaveModule(widgets) {
     SUBDIRS += \
         helloscript \
         context2d \
         defaultprototypes
 
-    !isEmpty(QT.uitools.name) {
+    qtHaveModule(uitools) {
         SUBDIRS += \
             calculator \
             qstetrix
-- 
cgit v1.2.1