summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBoris Moiseev <cyberbobs@gmail.com>2010-10-06 13:51:35 (GMT)
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-10-06 13:51:35 (GMT)
commit31ea34d217e28f83cf868c76a998d61a846385e6 (patch)
treebd0642072cdbfa9150777baac1d961ba5ade6a48 /tools
parent27fa758a28943698749a0608039efd88574da5e5 (diff)
downloadQt-31ea34d217e28f83cf868c76a998d61a846385e6.zip
Qt-31ea34d217e28f83cf868c76a998d61a846385e6.tar.gz
Qt-31ea34d217e28f83cf868c76a998d61a846385e6.tar.bz2
Finally removed the qtconfig dependency from qt3support
Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qtconfig/qtconfig.pro1
-rw-r--r--tools/tools.pro2
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/qtconfig/qtconfig.pro b/tools/qtconfig/qtconfig.pro
index 4cfc944..a066d4e 100644
--- a/tools/qtconfig/qtconfig.pro
+++ b/tools/qtconfig/qtconfig.pro
@@ -5,7 +5,6 @@ build_all:!build_pass {
CONFIG += release
}
LANGUAGE = C++
-QT += qt3support
contains(QT_CONFIG, gstreamer):LIBS += $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10
contains(QT_CONFIG, gstreamer):QMAKE_CXXFLAGS += $$QT_CFLAGS_GSTREAMER
diff --git a/tools/tools.pro b/tools/tools.pro
index 8f23fe4..c64fe25 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -20,7 +20,7 @@ TEMPLATE = subdirs
SUBDIRS += designer
}
}
- unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+ unix:!mac:!embedded:SUBDIRS += qtconfig
win32:!wince*:SUBDIRS += activeqt
}
contains(QT_CONFIG, declarative):SUBDIRS += qml