| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
When external projects use the infix configuration of Qt (QT_LIBINFIX),
they can make their own library targets infixed. This fix cleans the
infix from deffile names for such projects also, as long as the project
defines variable QT_LIBINFIX_USED.
Change-Id: Ifaf773c60d1ebe6f947f1cd44b76428de1c23dbf
Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
|
|
|
|
|
|
|
|
| |
Some Qt language codes now map to two Symbian language codes. Also added
the missing en_in mapping.
Task-number: ou1cimx1#947060
Reviewed-by: Pasi Pentikainen
|
|
|
|
|
|
|
|
|
|
| |
A lot of platform applications have all-lowercase translation files
due to file naming policies. This makes no difference for runtime
translation, so removed unnecessary case sensitivity when parsing ts
filenames for localization deployment.
Task-number: QT-5305
Reviewed-by: Sami Merila
|
|
|
|
|
|
|
|
|
|
|
|
| |
It is now possible to make shadow builds in Symbian.
Note that any relative host side paths specified via BLD_INF_RULES,
MMP_RULES, or DEPLOYMENT pkg_*rules are NOT automatically converted
to point to build directory.
Task-number: QTBUG-10432
Rubber-stamped-by: ossi
Reviewed-by: TrustMe
|
|
|
|
|
|
|
| |
Def file paths are now generated absolute
Task-number: QTBUG-10703
Reviewed-by: Sami Merila
|
|
|
|
|
|
|
|
|
|
|
| |
The graphics memory quota, which is a new feature in S60 5.4, now gets
default value of 24MB. User can override the default value using
RSS_RULES:
RSS_RULES += "graphics_memory=<# of kB>;"
Task-number: QT-4963
Reviewed-by: Sami Merila
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
The patch applies everything from the original, except for the
filename case changes in LIBS which are handled differently
based on the auto-detected is_using_gnupoc CONFIG value.
Reviewed-by: Laszlo Agocs
|
| |
| |
| |
| |
| |
| | |
The akndoc.h was moved to epoc32/include/mw.
Reviewed-By: axis
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Changing the library names to lowercase breaks 5.0-based
Linux builds. It will be investigated if it is possible to
change the SDKs instead. If not, the patch will have to be
extended to use the original names for 5.0 and the lowercased
ones otherwise.
This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/text/qfontengine_ft.cpp
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtMultimediau.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/bwins/QtScriptu.def
src/s60installs/bwins/QtSqlu.def
src/s60installs/bwins/QtTestu.def
src/s60installs/bwins/QtXmlPatternsu.def
src/s60installs/bwins/QtXmlu.def
src/s60installs/bwins/phononu.def
src/s60installs/s60installs.pro
tests/auto/qcssparser/qcssparser.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp
Changes in qtextlayout.cpp and tst_qtextlayout.cpp and
qfontengine_ft.cpp are not merged because they will have
other fixes in 4.8
|
| |
| |
| |
| | |
Reviewed-by: Laszlo Agocs
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
QNAM HTTP: Fix bug with explicitly zero-length compressed responses.
Add enablers for Symbian App Booster
Don't rely on uninitialized data
Don't realloc user-provided buffer
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
To use the Symbian App Booster, a registration file (matching the
filename of the executable, eg helloworld.applite) must be copied to the
import folder within QtAppBooster's private directory. The appropriate
library (qdeclarativebooster) must also be linked against. With this
change, the required actions are carried out by adding
"CONFIG += symbian_appbooster" to the application's .pro file.
Task-number: QT-4892
Reviewed-by: Miikka Heikkinen
|
|\ \ \
| |/ / |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: axis
|
| | |
| | |
| | |
| | | |
Reviewed-by: axis
|
|/ /
| |
| |
| |
| |
| |
| | |
Temp directory for packagaging got created to system root if
OBJECTS_DIR was empty. Fixed it to use '.' instead in those cases.
Reviewed-by: Janne Koskinen
|
|\ \ |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/example-slideswitch.qdoc
doc/src/development/qmake-manual.qdoc
doc/src/snippets/code/doc_src_qmake-manual.pro
doc/src/snippets/code/doc_src_qtscript.qdoc
src/corelib/animation/qabstractanimation.cpp
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/eabi/QtOpenGLu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qdir/qdir.pro
tests/auto/qsslsocket/tst_qsslsocket.cpp
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
A new QSysInfo::S60Version enum value SV_S60_5_3 is introduced.
QSysInfo::symbianVersion still returns SV_SF_3 for the new platform.
The official name of the platform is still pending, so documentation
will be updated later.
Task-number: QT-4593
Reviewed-by: Sami Merila
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This usually points to the RVCT include directory, but those headers
are not appropriate for Symbian.
RevBy: Trust me
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: Miikka Heikkinen
Conflicts:
mkspecs/symbian-gcce/qmake.conf
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6
commit, which adds localization based on TRANSLATIONS keywords for
Raptor and abld.
In addition, since the __PRODUCT_INCLUDE__ define was creating a lot
of trouble regarding < and >, it was refactored into its own source
file, which is automatically included before every source file.
Task: QTBUG-15292
RevBy: Miikka Heikkinen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It used to be carried out inside qt.prf, but was moved to
default_post.prf. However, since qt.prf is executed after
default_post.prf, it would still prepend its own include paths at the
very front, which is wrong.
Fixed by introducing a new feature profile for PREPEND_INCLUDEPATH,
which is run after qt.prf (features in $$CONFIG are executed in
reverse order).
RevBy: Miikka Heikkinen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The file that they were in would not be parsed if CONFIG -= qt, but
it always needs to be parsed, otherwise apps that don't use Qt will
fail the sis file creation.
RevBy: Miikka Heikkinen
Conflicts:
mkspecs/features/symbian/default_post.prf
|
| | | |
| | | |
| | | |
| | | | |
RevBy: Trust me
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: Thomas Zander
Conflicts:
mkspecs/features/symbian/symbian_building.prf
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
These should work for both Windows and UNIX platforms.
RevBy: Thomas Zander
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This was done for a number of reasons:
- In order to get better consistency with the other mkspecs, which
have the target system name followed by a hyphen and the compiler
name.
- There is no real reason why we should have specific mkspecs for
compiling Symbian under Linux, when it is equally likely to work
under other operating systems.
RevBy: Thomas Zander
Conflicts:
src/s60main/s60main.pro
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Temporary files created by these two scripts will now be created
under a separate directory, contents of which is also added to cleanup.
Task-number: QTBUG-11394
Reviewed-by: axis
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
"make clean" will now delete any generated ".make.cache" files in
symbian-abld builds.
Task-number: QTBUG-15733
Reviewed-by: Janne Koskinen
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When querying system locale it does return both language and country,
so sometimes users want to have both in their .ts file names
(e.g. myapp_zh_CN.ts). This is bit problematic in Symbian, where
there are separate language codes for only very few language +
country combinations. Until now, the unsupported combinations were
simply dropped from deployment localization.
More proper way to handle these unknown language + country combinations
is to fall back to using the plain language code for them instead of
dropping them altogether. This is somewhat analogous to how
QTranslator::load() loads .ts files if it can't find the file for
specified language + country combination.
E.g. User defines:
TRANSLATIONS += myapp_zh_CN.ts myapp_zh_HK.ts myapp_zh_TW.ts
There are separate Symbian language codes for HongKong Chinese
(zh_HK = 30) and Taiwanese Chinese (zh_TW = 29), but rest of the world
is expected to use just Chinese (zh = 31). This means "zh_CN" mapping
is not provided as it would be same as plain "zh".
With this fix, qmake will now automatically generate a fallback
mapping from "zh_CN" to "31" for deployment localization purposes, and
is able to read application captions and pkg names from myapp_zh_CN.ts.
If there are multiple TRANSLATIONS defined that would result in same
Symbian language code, only the first one is used.
Task-number: QTBUG-17927
Reviewed-by: Oswald Buddenhagen
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/features/symbian/symbian_building.prf
mkspecs/symbian-gcce/qmake.conf
src/corelib/global/qnamespace.h
src/corelib/global/qnamespace.qdoc
src/plugins/plugins.pro
tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
|
| |
| |
| |
| |
| |
| | |
It's needed by building QtOpenGL of Qt for Symbian on Linux and Mac with gcce at least.
RevBy: axis
|
| |
| |
| |
| | |
RevBy: Trust me
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/development/qmake-manual.qdoc
|
| |\ \ |
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This usually points to the RVCT include directory, but those headers
are not appropriate for Symbian.
RevBy: Trust me
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6
commit, which adds localization based on TRANSLATIONS keywords for
Raptor and abld.
In addition, since the __PRODUCT_INCLUDE__ define was creating a lot
of trouble regarding < and >, it was refactored into its own source
file, which is automatically included before every source file.
Task: QTBUG-15292
RevBy: Miikka Heikkinen
|
|\ \ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
demos/declarative/samegame/SamegameCore/samegame.js
mkspecs/features/symbian/default_post.prf
src/declarative/qml/qdeclarativeengine.cpp
src/gui/text/qtextdocumentlayout.cpp
src/plugins/plugins.pro
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/s60installs.pro
tests/auto/declarative/declarative.pro
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
tests/auto/declarative/qmlvisual/qmlvisual.pro
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Qt applications built against Symbian3 SDK will not run on older
devices, so remove the platform dependency to those devices so that
the user will get a proper warning if he tries to install incompatible
software to an older device.
Task-number: QTBUG-17187
Reviewed-by: Janne Koskinen
|
|\ \ \ \ \
| |/ / / /
| | | | /
| |_|_|/
|/| | |
| | | | |
Conflicts:
mkspecs/features/symbian/application_icon.prf
src/sql/drivers/odbc/qsql_odbc.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Mif file cleaning was incorrectly done at distclean phase.
Task-number: QTBUG-16893
Reviewed-by: axis
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
There is no fundamental reason to not have dash or dot in binary names
in Symbian, so do not replace them with underscore.
One thing that doesn't work with a dot in the filename is launching
an application via resources, so automatic resource generation is
suppressed for applications that have a dot in filename portion of
the TARGET value.
Task-number: QTBUG-16888
Reviewed-by: axis
|