diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-04-16 03:37:40 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-16 04:03:06 (GMT) |
| commit | 4402d3ab051eb6f3f064bc7d2bcac64d811c52ea (patch) | |
| tree | bffa557c67516622f55975c3562fe655a701ddb1 | |
| parent | 464e13a0150b214ba921fcd627faee931dc794d2 (diff) | |
| download | Qt-4402d3ab051eb6f3f064bc7d2bcac64d811c52ea.zip Qt-4402d3ab051eb6f3f064bc7d2bcac64d811c52ea.tar.gz Qt-4402d3ab051eb6f3f064bc7d2bcac64d811c52ea.tar.bz2 | |
Fix duplicate project entry in visual studio solution file.
The marshal project was being appended to SUBDIRS twice.
Reviewed-by: Justin McPherson
(cherry picked from commit 551d704cdafae46cdccc6217bb7f36da7e84be2d)
| -rw-r--r-- | examples/script/script.pro | 2 |
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 |