--- a/homescreenapp/common.pri Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/common.pri Wed Aug 18 09:40:07 2010 +0300
@@ -1,4 +1,4 @@
-#
+
# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
@@ -33,7 +33,7 @@
SUBDIRPART = release
}
-win32: OUTPUT_DIR = $$PWD/../../bin/$$SUBDIRPART
+!symbian: OUTPUT_DIR = $$PWD/../../bin/$$SUBDIRPART
symbian: OUTPUT_DIR = $$PWD/bin
SOURCE_DIR = $$PWD/inc
@@ -45,6 +45,7 @@
MOC_DIR = $$OUTPUT_DIR/tmp/$$TARGET/moc
RCC_DIR = $$OUTPUT_DIR/tmp/$$TARGET/rcc
UI_DIR = $$OUTPUT_DIR/tmp/$$TARGET/ui
+ CONFIG -= app_bundle
} else { # test part is NOT DONE
QT *= testlib
CONFIG += console
@@ -68,19 +69,16 @@
INCLUDEPATH += $$MOC_DIR
TARGET.CAPABILITY = ALL -TCB
TARGET.EPOCALLOWDLLDATA=1
-}
-
-win32 {
+} else {
# add platfrom API for windows
INCLUDEPATH += \
- $$PWD/../../homescreensrv/homescreensrv_plat/contentstorage_api \
- $$PWD/../../homescreensrv/homescreensrv_plat/hswidgetmodel_api \
+ $$PWD/../../homescreensrv/homescreensrv_plat/contentstorage_api \
$$PWD/../../homescreensrv/homescreensrv_plat/homescreen_information_api/inc
}
plugin: !isEmpty(PLUGIN_SUBDIR): DESTDIR = $$OUTPUT_DIR/$$PLUGIN_SUBDIR
-win32: plugin { # copy manifiers
+!symbian: plugin { # copy manifiers
manifest.path = $$DESTDIR
manifest.files = ./resource/*.manifest ./resource/*.xml
manifest.CONFIG += no_build
@@ -99,10 +97,6 @@
qtplugins.path = $$PLUGIN_SUBDIR
qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
-
- message(Remove "contains(MOBILITY, serviceframework)" after the QtSF refactorig is done!)
-
- !contains(MOBILITY, serviceframework):qtplugins.sources += resource/$${TARGET}.manifest
hs_public_plugin {
contains(MOBILITY, serviceframework):BLD_INF_RULES.prj_exports += "resource/$${TARGET}.xml z:/private/20022F35/$${TARGET}.xml"
@@ -120,8 +114,7 @@
for(entry, entries) : BLD_INF_RULES.prj_exports += "./$$entry z:/$$replace(2, ^/,)/$$basename(entry)"
}
export ( BLD_INF_RULES.prj_exports)
-}
-win32 {
+} else {
name = $$replace(1, [/\\\\\.\*], _)
eval ($${name}.path = $${OUTPUT_DIR}/$${2})
eval ($${name}.files = $$1)
@@ -138,10 +131,11 @@
}
}
-!exists($${EPOCROOT}epoc32/include/platform/mw/XQSettingsManager) {
- DEFINES += NO_QT_EXTENSIONS
+symbian {
+ DEFINES += QT_EXTENSIONS
}
+
# support for NFT
nft:DEFINES += NFT