summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-09-20 08:44:27 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-20 06:28:43 +0200
commit8e4a2af6a232ca029b6ee4136159aad22283078a (patch)
tree0c04310c28d113266c994f64c50e42cfe057f057
parentf8ee9c1736334e07e1723164402b81802234ce9c (diff)
downloadqtscript-8e4a2af6a232ca029b6ee4136159aad22283078a.tar.gz
Disabled calculator, qstetrix to resolve impossible circular dependency
These qtscript examples depend on uitools, which is in qttools, which depends on qtscript - a circular dependency. Disable the offending examples for now. Change-Id: Icd684fde329d72fd48eb476dc9f9d0c8440a3a29 Reviewed-on: http://codereview.qt-project.org/5167 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r--examples/script/script.pro1
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/script/script.pro b/examples/script/script.pro
index 69e3726..a12d750 100644
--- a/examples/script/script.pro
+++ b/examples/script/script.pro
@@ -4,7 +4,6 @@ SUBDIRS = customclass
!wince*:!contains(QT_CONFIG, no-gui):SUBDIRS += qscript marshal
!wince*:SUBDIRS *= marshal
-!wince*:!cross_compile:!contains(QT_CONFIG, no-gui):SUBDIRS += calculator qstetrix
symbian: SUBDIRS = context2d