aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-05-13 10:13:24 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-13 12:05:56 +1000
commitd4da74a74d248375a08dc5bac2f9b1afe9a452f3 (patch)
tree2e350d720f6f6f39cffd6d8cc6c7e0f1b8408a65
parent3dfd8e78d467239bb230addb7617e7f0949d29b4 (diff)
Remove platform-specific logic for qtactiveqt module.
For the sake of a uniform test procedure, it is cleaner to have `make module-qtactiveqt' always working, but simply not building anything on platforms where ActiveQt is not supported. Without this, any test procedure for building Qt5 needs to be able to know or determine that ActiveQt should only be built on Windows. Reviewed-by: Jason McDonald Change-Id: I3869bbacdc6598a764561a4b9f6042c49e6ffae8
-rw-r--r--qt.pro2
m---------qtactiveqt0
2 files changed, 1 insertions, 1 deletions
diff --git a/qt.pro b/qt.pro
index f174aed1..78cff58c 100644
--- a/qt.pro
+++ b/qt.pro
@@ -85,10 +85,10 @@ SUBDIRS = \
module_qlalr \
module_qtqa \
module_qtlocation \
+ module_qtactiveqt \
exists(qtwebkit/Tools/Scripts/build-webkit) {
SUBDIRS += module_qtwebkit \
module_qtwebkit_examples_and_demos
module_qttools.depends += module_qtwebkit
}
-win32:SUBDIRS += module_qtactiveqt
diff --git a/qtactiveqt b/qtactiveqt
-Subproject e2deded490725473f1bb0b042e5022fffe534f2
+Subproject 6729e60cfac84e8f6eb28cf473ce0c75f88d35c