summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-04-22 04:48:09 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-04-22 04:48:09 (GMT)
commit1139eb432a18d556efb4ecfc079e82c2e2093b96 (patch)
tree57bbe6a7588ba01d88f0a9b9b28e4d95beadad1d /src/src.pro
parent2366667fc97eb6a56203b2dd7dac776ff4164abd (diff)
parentdb4e2a600c53ad857d7fa3f7d84ac995215ecf93 (diff)
downloadQt-1139eb432a18d556efb4ecfc079e82c2e2093b96.zip
Qt-1139eb432a18d556efb4ecfc079e82c2e2093b96.tar.gz
Qt-1139eb432a18d556efb4ecfc079e82c2e2093b96.tar.bz2
Merge branch 'master' of ../../qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro
index f413f5d..e35c3f5 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -13,7 +13,7 @@ wince*:{
contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
}
}
-win32:!contains(QT_EDITION, OpenSource|Console): {
+win32:{
SRC_SUBDIRS += src_activeqt
!wince*: SRC_SUBDIRS += src_tools_idc
}