| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Backport of bc80ee36f8ffe18f8362b2328ca29f92291df132
Change-Id: I76453dadc24c9bf7ff34d972214c057b82143c77
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Making -lang-c++ integral part of the $CXX command was wrong, because there are
cases where $CXX must be called without the -lang-c++ file (when building asm
files for instance). This commit moves the -lang-c++ to $CXX_FLAGS where it
belongs.
Backport of commits
f4f185edd9dda513320e23b9a3e3f92be203884f
e3224554272600a22fd9d22bdb754832b5127da2
Change-Id: I18be06411648281bd42f3c40b8add637cd7ddfa0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
| |
Add this include to reduce the startup time of QML based applications.
Supporting the "Qt 4.7" module name isn't needed for QNX.
Change-Id: I86db40eefa83ccdd53a036faf0df4fd2135b2b74
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
| |
Disable QPF & QPF2 fonts and dummy (QWS) input methods.
Change-Id: I020f8e9f7e240a7bc4d31a008513e2289bb46f18
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
| |
Change-Id: I504d987abd092d25c68f7209cb5787a01d6fac50
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Add new enums for future Symbian platforms.
Task-number: QT-4593
Change-Id: I23b616c6d62d9d56d2b8ec6ac7edb8f6a84211e8
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
| |
Backport of 2d5a4a5d3aae4efe7c17cadf03dfbb5cc4c36e86 from qtbase.
Change-Id: Id8453fdd40c88acd27f2ddd932a5a410382e1b67
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Modifies existing structure of INTEGRITY mkspecs to be more clear and
adds a new mkspec for INTEGRITY x86 target. This also moves mkspecs
to supported folder as this is the case in 4.8.x.
Task-number: QTBUG-24153
Change-Id: Iae893c20f88050040f7686ab2ab272c1d1af22bb
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
mkspecs for QNX qcc, armv7le and x86 targets
cherry-picked from 43a48ad218fec43ef3c854cb4e215e7b372b23d4
Change-Id: Ic4bb8947aa4dd31a3ab6e23c36775f9c64d1443c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@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
|
|
|
|
|
|
| |
Task-number: QTBUG-10432
Rubber-stamped-by: ossi
Reviewed-by: TrustMe
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/fancybrowser/fancybrowser.pro
src/3rdparty/libpng/ANNOUNCE
src/3rdparty/libpng/CHANGES
src/3rdparty/libpng/CMakeLists.txt
src/3rdparty/libpng/LICENSE
src/3rdparty/libpng/README
src/3rdparty/libpng/configure.ac
src/3rdparty/libpng/example.c
src/3rdparty/libpng/libpng-manual.txt
src/3rdparty/libpng/libpng.3
src/3rdparty/libpng/libpngpf.3
src/3rdparty/libpng/png.5
src/3rdparty/libpng/png.c
src/3rdparty/libpng/png.h
src/3rdparty/libpng/pngconf.h
src/3rdparty/libpng/pngerror.c
src/3rdparty/libpng/pnginfo.h
src/3rdparty/libpng/pnglibconf.h
src/3rdparty/libpng/pngmem.c
src/3rdparty/libpng/pngpread.c
src/3rdparty/libpng/pngpriv.h
src/3rdparty/libpng/pngread.c
src/3rdparty/libpng/pngrtran.c
src/3rdparty/libpng/pngrutil.c
src/3rdparty/libpng/pngset.c
src/3rdparty/libpng/pngstruct.h
src/3rdparty/libpng/pngtest.c
src/3rdparty/libpng/pngtrans.c
src/3rdparty/libpng/pngvalid.c
src/3rdparty/libpng/pngwrite.c
src/3rdparty/libpng/pngwtran.c
src/3rdparty/libpng/pngwutil.c
src/gui/dialogs/qfiledialog_symbian.cpp
src/gui/kernel/qsoftkeymanager.cpp
src/s60installs/s60installs.pro
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-20743
Reviewed-by: Liang Qi
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-20697
Reviewed-by: Shane Kearns
Reviewed-by: Miikka Heikkinen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
CODA 4.1.* cannot be used to debug binaries that do not have
DEBUGGABLE_UDEBONLY keyword specified, so add this keyword to all
projects by default. Adding this keyword has no impact for previous
versions of CODA or TRK.
Task-number: QTBUG-20669
Reviewed-by: Shane Kearns
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
doc/src/external-resources.qdoc
src/gui/text/qtextlayout.cpp
src/opengl/qwindowsurface_gl.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
Initial implementation of QPixmap::fromSymbianRSgImage(RSgImage*)
on OpenGL graphics system.
Task-number: QTBUG-15254
Reviewed-by: Laszlo Agocs
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updating file with CRLF line endings for the updated header
Fix a regression in QList::mid()
update gitignore
remove -fno-stack-protector
Fix make confclean
Update licenseheader text in source files
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | | |
New files after previous license change round.
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
the common parts were moved into mkspecs/common/qnx/qmake.conf
and the redefinitions only were left in the target qmake.conf files.
this makes a customization process really-really easy now
Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add new enums for future Symbian platforms and fix the docs of
existing ones.
Task-number: QT-4593
Reviewed-by: Sami Merila
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Avkon calls BeginFullScreen() and EndFullScreen() to trigger the
fullscreen system transition effects for application exit, however
the calls are made too late for Qt apps because the widgets are
already destroyed. Instead, the effects are triggered explicitly
from Qt, before closing the widgets, or from aboutToQuit, whichever
comes first.
Task-number: QT-4718
Reviewed-by: Jani Hautakangas
|
| | |
| | |
| | |
| | | |
Reviewed-by: axis
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The enable_backup CONFIG value can be used to generate deployment
for backup registration file for an application.
BACKUP_REGISTRATION_FILE_SYMBIAN and BACKUP_REGISTRATION_FILE_MAEMO
variables can be used to specify a custom backup registration files.
Only works on Symbian and Maemo platforms.
Task-number: QTBUG-17214
Reviewed-by: Oswald Buddenhagen
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
If the path to translation file is already absolute, do not add
the $$_PRO_FILE_PWD_ to it in symbian.conf
Task-number: QT-4842
Reviewed-by: axis
|
| |
| |
| |
| |
| |
| |
| |
| | |
Symbian.
Task-number: QTBUG-18485
Reviewed-by: Miikka Heikkinen
Reviewed-by: axis
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Add flag for forcibly propagating backing store alpha to framebuffer
Fixed unmatched quotes in s60installs.pro
Added setSwitchPolicy to MeeGo graphicssystem helper API.
Add /q switch to QMAKE_DEL_FILE command in symbian
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Builds will otherwise halt without giving reason if a wildcard
is given in QMAKE_CLEAN in symbian-abld.
Task-number: QTBUG-18207
Reviewed-by: axis
|
|\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
mkspecs/qws/macx-nacl-g++/qplatformdefs.h
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
mkspecs/symbian-gcce/qmake.conf
qmake/generators/metamakefile.cpp
qmake/generators/win32/mingw_make.cpp
src/corelib/global/global.pri
src/corelib/global/qglobal.h
src/opengl/qgl.cpp
src/opengl/qwindowsurface_gl.cpp
src/plugins/platforms/wayland/qwaylandbuffer.h
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tools/designer/src/components/formeditor/qdesigner_resource.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Better to make it relative to the profile. That way it is always
found, regardless of where Qt is located.
RevBy: Liang Qi
|
| | | |
| | | |
| | | |
| | | | |
RevBy: Oswald Buddenhagen
|
| | | |
| | | |
| | | |
| | | | |
RevBy: Oswald Buddenhagen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is needed for Symbian development on Windows using makefiles.
RevBy: Trust me
|