summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2010-04-16 03:37:40 (GMT)
committerAndrew den Exter <andrew.den-exter@nokia.com>2010-04-16 03:41:52 (GMT)
commit551d704cdafae46cdccc6217bb7f36da7e84be2d (patch)
tree446a934dfe6e0190d093e1af03bf8ede52c3f2b6 /examples
parenta9146aa97ea7cf9fc9fab7f86b702a4223ab707c (diff)
downloadQt-551d704cdafae46cdccc6217bb7f36da7e84be2d.zip
Qt-551d704cdafae46cdccc6217bb7f36da7e84be2d.tar.gz
Qt-551d704cdafae46cdccc6217bb7f36da7e84be2d.tar.bz2
Fix duplicate project entry in visual studio solution file.
The marshal project was being appended to SUBDIRS twice. Reviewed-by: Justin McPherson
Diffstat (limited to 'examples')
-rw-r--r--examples/script/script.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/script/script.pro b/examples/script/script.pro
index 9d9d524..a95ad13 100644
--- a/examples/script/script.pro
+++ b/examples/script/script.pro
@@ -3,7 +3,7 @@ SUBDIRS = customclass
!contains(QT_CONFIG, no-gui):SUBDIRS += helloscript context2d defaultprototypes
!wince*:!contains(QT_CONFIG, no-gui):SUBDIRS += qscript marshal
-!wince*:SUBDIRS += marshal
+!wince*:SUBDIRS *= marshal
!wince*:!cross_compile:!contains(QT_CONFIG, no-gui):SUBDIRS += calculator qstetrix
symbian: SUBDIRS = context2d