summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerio Valerio <valerio.valerio@nokia.com>2012-03-23 13:36:01 +0200
committerValerio Valerio <valerio.valerio@nokia.com>2012-03-23 13:36:01 +0200
commit544658f9c533a7aaa354765d783cc214d5735467 (patch)
treeb4c01bd80855432ad5d335fd97254056dafb7ccb
parent0b86accb1a063cdf4460ee1df306ee7b8ce50a7f (diff)
Fix Qtwidgets includes.
Make sure all GUI code is under QMF_NO_MESSAGE_SERVICE_EDITOR config option.
-rw-r--r--src/libraries/qmfclient/qmfclient.pro1
-rw-r--r--src/libraries/qmfmessageserver/qmfmessageserver.pro4
-rw-r--r--src/tools/messageserver/messageserver.pro4
3 files changed, 4 insertions, 5 deletions
diff --git a/src/libraries/qmfclient/qmfclient.pro b/src/libraries/qmfclient/qmfclient.pro
index 66aa2117..e9b0adbc 100644
--- a/src/libraries/qmfclient/qmfclient.pro
+++ b/src/libraries/qmfclient/qmfclient.pro
@@ -14,7 +14,6 @@ win32: {
}
QT = core sql network
-QT += widgets
symbian: {
include(../../../symbianoptions.pri)
diff --git a/src/libraries/qmfmessageserver/qmfmessageserver.pro b/src/libraries/qmfmessageserver/qmfmessageserver.pro
index 9c15add9..bb74e497 100644
--- a/src/libraries/qmfmessageserver/qmfmessageserver.pro
+++ b/src/libraries/qmfmessageserver/qmfmessageserver.pro
@@ -6,8 +6,8 @@ TARGET = qmfmessageserver
target.path += $$QMF_INSTALL_ROOT/lib
QT = core network
-QT += widgets
-!contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui
+
+!contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui widgets
symbian: {
TARGET.EPOCALLOWDLLDATA = 1
diff --git a/src/tools/messageserver/messageserver.pro b/src/tools/messageserver/messageserver.pro
index ac8f2d72..ebd7cda5 100644
--- a/src/tools/messageserver/messageserver.pro
+++ b/src/tools/messageserver/messageserver.pro
@@ -12,8 +12,8 @@ SERVER_AS_DLL: {
TARGET = messageserver
CONFIG += qmfmessageserver qmfclient
QT = core
-QT += widgets
-!contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui
+
+!contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui widgets
target.path += $$QMF_INSTALL_ROOT/bin