--- a/radioapp/buildflags.pri Fri Jun 11 16:24:13 2010 +0100
+++ b/radioapp/buildflags.pri Thu Jul 22 16:33:45 2010 +0100
@@ -23,18 +23,12 @@
# Use of some debugging controls that are not part of official UI spec
# RADIOFLAGS += USE_DEBUGGING_CONTROLS
-# Reads the layout docml files and images from e:/radiotest/ folder
-# RADIOFLAGS += USE_LAYOUT_FROM_E_DRIVE
-
# Flag to use dummy radio data read from XML file
# RADIOFLAGS += USE_DUMMY_RADIO_DATA
# Functional testing
# RADIOFLAGS += SHOW_CALLSIGN_IN_ANY_REGION
-# Build flag to enable usage of the new preset utility
-RADIOFLAGS += COMPILE_WITH_NEW_PRESET_UTILITY
-
# Build flag to add EXPORTUNFROZEN to the pro file
# RADIOFLAGS += USE_UNFROZEN_EXPORTS
@@ -47,10 +41,10 @@
# Full logging flag that enables the full logging including also timestamps
# Enabled by default in debug builds
- CONFIG(debug, debug|release) : LOGGING_FLAGS += LOGGING_ENABLED
+# CONFIG(debug, debug|release) : LOGGING_FLAGS += LOGGING_ENABLED
# Uncomment to enable full logging in release builds
-# LOGGING_FLAGS *= LOGGING_ENABLED
+LOGGING_FLAGS *= LOGGING_ENABLED
# Timestamp logging flag that enables only timestamp logging
# LOGGING_FLAGS += TIMESTAMP_LOGGING_ENABLED
@@ -58,6 +52,17 @@
# Combines Ui and Engine logs by feeding UI traces to the engine logger
LOGGING_FLAGS += COMBINE_WITH_ENGINE_LOGGER
+# Logging level
+# 1 - Normal level
+# 2 - More verbose level
+# 3 - Most verbose level
+LOGGING_FLAGS += LOGGING_LEVEL=1
+
+# Select which radio component is being logged
+# 1 - Radio application
+# 2 - Radio homescreen widget
+LOGGING_FLAGS += LOGGED_COMPONENT=1
+
contains(LOGGING_FLAGS, TIMESTAMP_LOGGING_ENABLED)|contains(LOGGING_FLAGS, LOGGING_ENABLED) {
# Writes debug prints to file if enabled
@@ -75,6 +80,11 @@
# 2 - Log failed connection and halt debugger
LOGGING_FLAGS += CONNECT_TEST_MODE=2
+win32: {
+ LOGGING_FLAGS *= LOGGING_ENABLED # Logging is always enabled in Win32 environment
+ RADIOFLAGS += VID_DEFAULT=0
+}
+
DEFINES += $$LOGGING_FLAGS
# ##########################################################
@@ -87,28 +97,36 @@
CONFIG += $$LOGGING_FLAGS
symbian: {
- DEFINES += SYMBIAN
+ DEFINES += SYMBIAN
TARGET.EPOCALLOWDLLDATA = 1
TARGET.VID = VID_DEFAULT
TARGET.CAPABILITY = CAP_GENERAL_DLL
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+ SYMBIAN_PLATFORMS = WINSCW ARMV5
+ MMP_RULES += SMPSAFE
}
+# QT 4.7 changes the def file location so force them to stay where they are
+defFilePath = ..
+
win32: {
DEFINES += BUILD_WIN32
DESTDIR = ../bin
LIBS += -L../bin
INCLUDEPATH += ../radioenginewrapper/inc
+ INCLUDEPATH += ../../internal/win32_stubs
+ HEADERS += ../../internal/win32_stubs/qsysteminfo.h
+ HEADERS += ../../internal/win32_stubs/xqserviceutil.h
+ HEADERS += ../../internal/win32_stubs/xqserviceprovider.h
+ SOURCES += ../../internal/win32_stubs/win32_stubs.cpp
}
USE_UNFROZEN_EXPORTS {
- symbian:MMP_RULES += "exportunfrozen"
+ symbian:MMP_RULES += "exportunfrozen"
symbian:DEF_FILE = not_used.def
}
-# $$_PRO_FILE_PWD_ points to the directory of the pro file
-MOC_DIR = $$_PRO_FILE_PWD_/tmp
-RCC_DIR = $$_PRO_FILE_PWD_/tmp
-OBJECTS_DIR = $$_PRO_FILE_PWD_/tmp
-UI_DIR = $$_PRO_FILE_PWD_/tmp
-UI_HEADERS_DIR = $$_PRO_FILE_PWD_/tmp
-UI_SOURCES_DIR = $$_PRO_FILE_PWD_/tmp
+# Place generated files away from the source folder
+MOC_DIR = /epoc32/build/radioapp/$$TMP_DIR_NAME
+RCC_DIR = /epoc32/build/radioapp/$$TMP_DIR_NAME
+OBJECTS_DIR = /epoc32/build/radioapp/$$TMP_DIR_NAME