Binary file content/apps/qt.sisx has changed
--- a/mkspecs/features/symbian/def_files_disabled.prf Fri Mar 12 15:46:37 2010 +0200
+++ b/mkspecs/features/symbian/def_files_disabled.prf Mon Mar 15 12:43:09 2010 +0200
@@ -2,12 +2,6 @@
CONFIG -= def_files
-# See def_files.prf for reasoning on the slight nastiness of this
-!contains(MMP_RULES, defBlock) {
- # See def_files.prf for reasoning for excluding target types and configs below
- !contains(TEMPLATE, app):!contains(CONFIG, plugin):!contains(CONFIG, staticlib): {
- # with EXPORTUNFROZEN enabled, new exports are included in the dll and dso/lib without
- # needing to run abld/sbs freeze
- MMP_RULES += EXPORTUNFROZEN
- }
-}
+# with EXPORTUNFROZEN enabled, new exports are included in the dll without
+# needing to run abld/sbs freeze
+MMP_RULES += EXPORTUNFROZEN
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mkspecs/solaris-cc-64-stlport/qmake.conf Mon Mar 15 12:43:09 2010 +0200
@@ -0,0 +1,8 @@
+#
+# qmake configuration for solaris-cc-64-stlport
+#
+
+include(../solaris-cc-64/qmake.conf)
+
+QMAKE_CXXFLAGS += -library=stlport4
+QMAKE_LFLAGS += -library=stlport4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mkspecs/solaris-cc-64-stlport/qplatformdefs.h Mon Mar 15 12:43:09 2010 +0200
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../solaris-cc-64/qplatformdefs.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mkspecs/solaris-cc-stlport/qmake.conf Mon Mar 15 12:43:09 2010 +0200
@@ -0,0 +1,8 @@
+#
+# qmake configuration for solaris-cc-stlport
+#
+
+include(../solaris-cc/qmake.conf)
+
+QMAKE_CXXFLAGS += -library=stlport4
+QMAKE_LFLAGS += -library=stlport4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mkspecs/solaris-cc-stlport/qplatformdefs.h Mon Mar 15 12:43:09 2010 +0200
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../solaris-cc/qplatformdefs.h"
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm Fri Mar 12 15:46:37 2010 +0200
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm Mon Mar 15 12:43:09 2010 +0200
@@ -7,20 +7,23 @@
# **
# ****************************************************************************/
-include $(FLMHOME)/metaflm.mk
SINGLETON:=$(call sanitise,TARGET_$(DEPLOY_TARGET))
CLEAN_TARGET:=
+# add EPOCROOT if missing (not if drive letters are present)
ifeq ($(findstring :,$(firstword $(DEPLOY_TARGET))), :)
DEPLOY_TARGET:=$(DEPLOY_TARGET)
else
- DEPLOY_TARGET:=$(EPOCROOT)$(DEPLOY_TARGET)
+ ifeq ($(findstring $(EPOCROOT), $(firstword $(DEPLOY_TARGET))), $(EPOCROOT))
+ DEPLOY_TARGET:=$(DEPLOY_TARGET)
+ else
+ DEPLOY_TARGET:=$(EPOCROOT)$(DEPLOY_TARGET)
+ endif
endif
define qmake_emulator_deployment
$(ALLTARGET):: $(1)
-FINAL::$(1)
# Prevent duplicate targets from being created
$(SINGLETON):=1
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm Fri Mar 12 15:46:37 2010 +0200
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm Mon Mar 15 12:43:09 2010 +0200
@@ -7,33 +7,29 @@
# **
# ****************************************************************************/
-include $(FLMHOME)/metaflm.mk
SINGLETON:=$(call sanitise,TARGET_$(PREDEP_TARGET))
+MY_CMD:=$(COMMAND)
+
# If the command has a drive letter, don't prepend EPOCROOT
-ifeq ($(findstring :,$(firstword $(COMMAND))), :)
- MY_CMD:=$(COMMAND)
-else
-#Additional checking is necessary for the Linux compilation
- ifeq ($(findstring $(EPOCROOT), $(firstword $(COMMAND))), $(EPOCROOT))
- MY_CMD:=$(COMMAND)
- else
- MY_CMD:=$(EPOCROOT)$(COMMAND)
+ifneq ($(findstring :,$(firstword $(COMMAND))), :)
+ # Additional checking is necessary for the Linux compilation
+ ifneq ($(findstring $(EPOCROOT), $(firstword $(COMMAND))), $(EPOCROOT))
+ ifeq ($(findstring /epoc32, $(firstword $(COMMAND))), /epoc32)
+ MY_CMD:=$(EPOCROOT)$(COMMAND)
+ endif
endif
endif
define qmake_extra_pre_targetdep
-$(ALLTARGET):: $(PREDEP_TARGET)
EXPORT:: $(PREDEP_TARGET)
-LIBRARY:: $(PREDEP_TARGET)
-TARGET:: $(PREDEP_TARGET)
# Prevent duplicate targets from being created
$(SINGLETON):=1
$(PREDEP_TARGET): $(DEPS)
- $(call startrule,qmake_extra_pre_targetdep) \
+ $(call startrule,qmake_extra_pre_targetdep,FORCESUCCESS) \
$(MY_CMD) \
$(call endrule,qmake_extra_pre_targetdep)
endef
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm Fri Mar 12 15:46:37 2010 +0200
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm Mon Mar 15 12:43:09 2010 +0200
@@ -7,7 +7,6 @@
# **
# ****************************************************************************/
-include $(FLMHOME)/metaflm.mk
POST_LINK_TARGET:=POST_LINK_$(PLATFORM_PATH)_$(CFG_PATH)_$(call sanitise,$(LINK_TARGET))
POST_LINK_DEP:=$(EPOCROOT)/epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/$(LINK_TARGET)
@@ -21,7 +20,6 @@
define qmake_post_link
$(ALLTARGET):: $(POST_LINK_TARGET)
-FINAL:: $(POST_LINK_TARGET)
$(POST_LINK_TARGET): $(POST_LINK_DEP)
$(call startrule,qmake_post_link) \
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm Fri Mar 12 15:46:37 2010 +0200
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm Mon Mar 15 12:43:09 2010 +0200
@@ -7,7 +7,6 @@
# **
# ****************************************************************************/
-include $(FLMHOME)/metaflm.mk
SINGLETON:=$(call sanitise,TSTORE_SINGLETON_$(EXTENSION_ROOT))
@@ -27,7 +26,7 @@
endif
define qmake_store_build
-FINAL:: $(STORE_BUILD_TARGET)
+ALL:: $(STORE_BUILD_TARGET)
$(STORE_BUILD_TARGET):
$(call startrule,qmake_store_build) \
--- a/mkspecs/symbian-sbsv2/flm/qt/ts2qm.flm Fri Mar 12 15:46:37 2010 +0200
+++ b/mkspecs/symbian-sbsv2/flm/qt/ts2qm.flm Mon Mar 15 12:43:09 2010 +0200
@@ -7,9 +7,7 @@
# FLM to convert .ts to .qm
-# Make sure that EPOCROOT ends in /
-EPOCROOT:=$(patsubst %/,%,$(EPOCROOT))/
-LRELEASE:=$(EPOCROOT)epoc32/tools/qt/lrelease$(DOTEXE)
+LRELEASE:=$(EPOCROOT)/epoc32/tools/qt/lrelease$(DOTEXE)
#TSFILE:=$(EPOCROOT)$(TSFILE)
#QMFILE:=$(EPOCROOT)$(QMFILE)
@@ -27,7 +25,6 @@
ifeq ($($(GUARD)),)
$(GUARD):=1
ALL:: $(QMFILE)
-RESOURCE:: $(QMFILE)
$(eval $(call ts2qm))
$(eval $(call whatmacro,$(QMFILE)))
$(eval $(call GenerateStandardCleanTarget,$(QMFILE),''))
--- a/src/3rdparty/webkit/WebCore/WebCore.pro Fri Mar 12 15:46:37 2010 +0200
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro Mon Mar 15 12:43:09 2010 +0200
@@ -27,7 +27,6 @@
# RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target.
# Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
MMP_RULES += "LINKEROPTION armcc --rw-base 0xE00000"
- MMP_RULES += BYTEPAIRCOMPRESSTARGET # :QTP:QT-2698
MMP_RULES += ALWAYS_BUILD_AS_ARM
QMAKE_CXXFLAGS.ARMCC += -OTime -O3
}
--- a/src/s60installs/deviceconfiguration/bld.inf Fri Mar 12 15:46:37 2010 +0200
+++ b/src/s60installs/deviceconfiguration/bld.inf Mon Mar 15 12:43:09 2010 +0200
@@ -17,13 +17,8 @@
qtconfig.mk /epoc32/tools/makefile_templates/qt/qtconfig.mk
qtconfig.meta /epoc32/tools/makefile_templates/qt/qtconfig.meta
-#ifdef SBSV2
wrappers/qmake.bat /epoc32/tools/qmake.bat
wrappers/qmake /epoc32/tools/qmake
-#else
-wrappers/qmake_abld.bat /epoc32/tools/qmake.bat
-wrappers/qmake_abld /epoc32/tools/qmake
-#endif
wrappers/moc.bat /epoc32/tools/moc.bat
wrappers/moc /epoc32/tools/moc
wrappers/rcc.bat /epoc32/tools/rcc.bat
--- a/src/s60installs/deviceconfiguration/qtconfig.meta Fri Mar 12 15:46:37 2010 +0200
+++ b/src/s60installs/deviceconfiguration/qtconfig.meta Mon Mar 15 12:43:09 2010 +0200
@@ -1,8 +1,3 @@
-# Meta information for Python Py2exe
-#
-# Copyright (c) 2007 Symbian Software Ltd. All rights reserved.
-#
-
platform tools2
makefile gnumake
techstream qt
--- a/src/s60installs/deviceconfiguration/qtconfig.mk Fri Mar 12 15:46:37 2010 +0200
+++ b/src/s60installs/deviceconfiguration/qtconfig.mk Mon Mar 15 12:43:09 2010 +0200
@@ -1,10 +1,3 @@
-#
-# Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-#
-# Description:
-#
-
# All paths used in this file end with the path delimiter '/'
include $(EPOCROOT)epoc32/tools/shell/$(notdir $(basename $(SHELL))).mk
@@ -41,7 +34,6 @@
$(SOURCEDIR)qmake$(DOTEXE): $(QT_ROOT)configure$(DOTEXE)
echo Configuring Qt for build on $(CONF_PLATFORM) with $(XPLATFORM) as build setup
cd $(CONFIGURE_ROOT) && $(QT_ROOT)configure$(DOTEXE) -platform $(CONF_PLATFORM) -xplatform $(XPLATFORM) $(OPTIONS)
- $(COPY) $(QT_ROOT).qmake.cache $(EPOC_ROOT)$(INSTALLPATH)qmake.cache
$(COPY) $(EPOC_ROOT)epoc32/gcc_mingw/bin/mingwm10.dll $(EPOC_ROOT)$(INSTALLPATH)mingwm10.dll
$(COPY) $(EPOC_ROOT)epoc32/gcc_mingw/bin/mingwm10.dll $(QT_ROOT)bin/mingwm10.dll
--- a/src/s60installs/deviceconfiguration/wrappers/qmake.bat Fri Mar 12 15:46:37 2010 +0200
+++ b/src/s60installs/deviceconfiguration/wrappers/qmake.bat Mon Mar 15 12:43:09 2010 +0200
@@ -7,7 +7,7 @@
SET __PRG__=%~dp0qt/qmake.exe
IF DEFINED QMAKESPEC GOTO :mkspec_set
-SET QMAKESPEC=%~dp0qt/mkspecs/symbian-sbsv2
+SET QMAKESPEC=%~dp0qt/mkspecs/symbian-abld
:mkspec_set
REM The following line can be used to enable qmake.cache