From d4da74a74d248375a08dc5bac2f9b1afe9a452f3 Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Fri, 13 May 2011 10:13:24 +1000
Subject: [PATCH] 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
---
 qt.pro     | 2 +-
 qtactiveqt | 2 +-
 2 files changed, 2 insertions(+), 2 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
index e2deded4..6729e60c 160000
--- a/qtactiveqt
+++ b/qtactiveqt
@@ -1 +1 @@
-Subproject commit e2deded490725473f1bb0b042e5022fffe534f2c
+Subproject commit 6729e60cfac84e8f6eb28cf473ce0c75f88d35cd