summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPrasanth Ullattil <prasanth.ullattil@nokia.com>2009-04-20 12:45:07 (GMT)
committerPrasanth Ullattil <prasanth.ullattil@nokia.com>2009-04-20 13:36:36 (GMT)
commit0b14582aa47e1c255e1bbd68ef5ced2e69ec31a8 (patch)
tree5e6fd62fd02b7b2d67767f5939fc1a71fccbeffa /tools
parent031adeaf42ddaef8d01338f6c59ba97170be5d53 (diff)
downloadQt-0b14582aa47e1c255e1bbd68ef5ced2e69ec31a8.zip
Qt-0b14582aa47e1c255e1bbd68ef5ced2e69ec31a8.tar.gz
Qt-0b14582aa47e1c255e1bbd68ef5ced2e69ec31a8.tar.bz2
Unable to build ActiveQt with Opensource edition.
Updated the project files and headers necessary for enabling this. Reviewed-by: Thiago Macieira Reviewed-by: Jens Bache-Wiig
Diffstat (limited to 'tools')
-rw-r--r--tools/activeqt/activeqt.pro11
-rw-r--r--tools/tools.pro2
2 files changed, 5 insertions, 8 deletions
diff --git a/tools/activeqt/activeqt.pro b/tools/activeqt/activeqt.pro
index a0e7de3..c50010c 100644
--- a/tools/activeqt/activeqt.pro
+++ b/tools/activeqt/activeqt.pro
@@ -2,10 +2,7 @@ TEMPLATE = subdirs
CONFIG += ordered
-contains(QT_EDITION, OpenSource|Console) {
- message("You are not licensed to use ActiveQt.")
-} else {
- SUBDIRS = dumpdoc \
- dumpcpp \
- testcon
-}
+SUBDIRS = dumpdoc \
+ dumpcpp \
+ testcon
+
diff --git a/tools/tools.pro b/tools/tools.pro
index ffc5d63..3325a57 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -15,7 +15,7 @@ no-png {
SUBDIRS += linguist
wince*: SUBDIRS = qtestlib designer
unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
- win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
+ win32:!wince*:SUBDIRS += activeqt
}
mac {