summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2010-08-18 09:02:16 (GMT)
committerPaul Olav Tvete <paul.tvete@nokia.com>2010-08-18 09:02:16 (GMT)
commit660732ed870d584ef704941a4b6a00dc6c84f38e (patch)
treeed3248a78a637dbde5cf1c14227e8971e14cf882 /src/src.pro
parent261fa64d61111741a9746459eac4901248eb19d3 (diff)
downloadQt-660732ed870d584ef704941a4b6a00dc6c84f38e.zip
Qt-660732ed870d584ef704941a4b6a00dc6c84f38e.tar.gz
Qt-660732ed870d584ef704941a4b6a00dc6c84f38e.tar.bz2
Only list activeqt once
This caused build errors for the Windows platform. Looks like a merge error introduced in commit 075e96eba50
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro
index 6118622..94ecb1b 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,7 +6,6 @@ win32:SRC_SUBDIRS += src_winmain
symbian:SRC_SUBDIRS += src_s60main
SRC_SUBDIRS += src_corelib src_xml src_network src_sql src_testlib
nacl: SRC_SUBDIRS -= src_network src_testlib
-win32:SRC_SUBDIRS += src_activeqt
!symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
!contains(QT_CONFIG, no-gui): SRC_SUBDIRS += src_gui
!wince*:!symbian:!vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support