| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Similar work was done in Qt5 in Change Id3b02316
Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
|
|
|
|
|
|
|
| |
backport in commit fc6569921d4bc06e3d526f18d4b4cd3ef05c2025 was
incomplete and broke building of configure.exe
Change-Id: I2c8b3b38beeca5629bec5bb2ca814242b12f0318
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
| |
Backport of 3f407cddf8b1d5fc09b414dbecd9a47d30e3abe7
Change-Id: Id7fd3ca76793d8d3e3698dd402fe31e04567e938
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
| |
This change is not necessary on Qt5.
Change-Id: Ie35db0d31dccd2771ba80030ee9104880f50e6b0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
This makes this test in line with other tests that define SRCDIR on the pro
file instead.
This change is not necessary in qt5
Change-Id: I789288c42a5c48bb62919fb361d2a357a8dd9832
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
The Blackberry OS uses a filesystem with the noatime option,
which returns a "wrong" access time.
cherry-picked from qt5 31f94e028527ffa02b954a3a91eabe80e2926838
Change-Id: Ic37d19b62ffbed6f67dbbbdf76bb4202bb0472e5
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
| |
Backport of 6998c4b2ad5fdf5f525bd77ec0fd3c6667b102b7
Change-Id: I32ceb7cc8e000c8fd00bf9e5ed6d6f8b796c73ad
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The only essential difference to msvc2010 is the define of _ALLOW_KEYWORD_MACROS.
It is a documented breaking change:
http://msdn.microsoft.com/en-us/library/bb531344.aspx
Updated backport of qtbase/1a4f58d3e67f3d271d9e24d7f52950f796542d2f
Change-Id: Iee8b900a214a9e5f289b2139d65f2e00c8113669
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The example needs no_batch in CONFIG because examples/script/customclass
and examples/script/qscript contain a main.cpp and nmake's inference
rules get confused which one to choose.
See QTBUG-13496 for details.
Change-Id: Ia5b06d985504ff4e72ea5e492a623edce252f57a
(cherry picked from commit qtscript/6bc42fb243edf5870c82cca6c53824a588007faf)
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
|
|
|
|
|
|
|
|
| |
Backport of d7a15fbfd93fb566c7793596ea50d8786b9eb654 from qtbase.
Task-number: QTBUG-27122
Change-Id: I0b1eda292fd9648e6f08629f7a069b66bb8b59e8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This prevents memory leaks when the engine is destroyed after exec()
has already finished. In most cases this happens during application
shutdown, at which point the event loop is never entered again.
Task-number: QTBUG-20377
Change-Id: I65564ed3e56314d656d92fd66f11ae67d4eb932b
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This test checks the access permissions for '/etc/passwd', however the
filesystem on Blackberry is always read-only.
cherry-picked from qt5 4a588c27e8073076cca19a8cc6eed5f1ce1d07e2
Change-Id: I6d14785dd94205761e3a73fc7aa420b805cd13a6
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
|
| |
ENABLE_EXECUTABLE_ALLOCATOR_FIXED requires sys/mman.h which is not
available with MinGW-w64.
Change-Id: I6e76ce0c570e5819657debf813f0e80cef907dd4
(cherry picked from commit 02c37f59839b7bb36b231560893fa3bccbecc065)
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
| |
cherry-picked from qt5/qtbase commit 5c412fd74c9164f1e73a7287ca603295ce73bcf5
Change-Id: Ib55b63d82823a348857b0f76e99b184eb475ef44
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I5c2df20442cdced085061622674fb7ba126028a8
Reviewed-by: Simo Fält <simo.falt@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Otherwise CROSS_COMPILE is not available for config.tests
because qdevice.pri is not found in such configurations as:
./configure -xplatform win32-g++-4.6 \
-device-option CROSS_COMPILE=$TARGET \
-prefix=$PREFIX/$TARGET \
-prefix-install
Normally, we don't want to use .qmake.cache during tests,
but we need that mechanism here.
Change-Id: If255f9657fa4206c4875a730f467d58b8a1c6ac1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Introduced by 2e0003eda4783f69a40fb4b31e7084c761d9640d. We were
missing a attributesEmitted=true which caused the output from
toHtml() to sometimes be invalid when using pixel sizes to
specify the font size.
This is a back-port of e640ebacb97f6eea9614925b1da3b97a0ff51409
from Qt 5.
Task-number: QTBUG-25778
Change-Id: Ied61fcaef425a590d71c0b52292ac676cb88ba52
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
|
|
|
|
|
|
| |
Change-Id: I4e958c1a0053a0c582a10a36dc0f4841ad39f715
Reviewed-by: Leonard Lee <leonard.lee@nokia.com>
Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
QDirectFbWindowSurface::resize() must call parent
QWindowSurface::resize() method in order to update QWindowSurfacePrivate
size.
Change-Id: Icd605dc1923f2560579ccb2e4f800c80ff7e92fd
Reviewed-by: Holger Freyther <holger+qt@freyther.de>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reduces memory consumption of an application quite a bit.
This is a backport of 3958828af8ee5cc046c664d8d8e483314eac06cb from
qtjsbackend.
At the same time, it is a backport of upstream commit
http://trac.webkit.org/changeset/111234, although the patch is quite
different as upstream and Qt's JSC have diverged a lot.
Change-Id: Ia76359ae614ddd4aeda9c7c7b012e5809b50074d
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some POSIX platforms do not support realpath(X, 0).
This commit is akin to the following qt5 commits:
4a4e9e4a9c56f9b27f2fb76fae6ff06b9f470895
ad5d64226abd50a43856ab560583f37b49ff04c9
6e8e1da0a8267d2f8f568403e6ab9fe53b01cd29
f3707a5a0c4483b15e7bb2ba9f0e7d1913a713ee
Change-Id: I05dc12cedefcaaa11eec2bcc71df023fdb51ac00
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
| |
Change-Id: I6f83b1223b7bd57b5dfc46fe5bed276269b1a676
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
| |
patch not needed for Qt5
Change-Id: I26a6cd8de91dc6df7d31a9f38187f7b1e8209cc1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This partially reverts commit c7d5071afc6c76925c90ff35041dc4eb86511271.
Despite what the commit message said, pkg-config previously worked
and was useful, particularly for static Qt. Qt itself even installs
its own .pc files.
Note: The mkspec win32-g++-cross had a PKG_CONFIG definition to avoid
using the pkg-config installation on the build machine.
cherry-picked from qt5/qtbase commit 7d9b5e8e7d2094dedbe7e3e2f961544f233ce57e
Change-Id: I6c6ed81b2ab42c9cf7f7e250feeeb9c34c8877e7
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Extend drawPixmap capabilities for qpa through new OpacityPixmapCapability
QBlittable flag and add related implementation in DirectFB platform.
cherry-picked from qt5/qtbase 4ae829c1dbd0e8a72b82ab4c6cddb0a4ffe009f6
Change-Id: I8abdb0fa72bc030d769190d7cba40561007e7b46
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
If the sendEvent function is replaced on the NSApplication, then
QApplication should ensure that it undoes that if it is destroyed while
the NSApplication is still running.
Task-number: QTBUG-24248
Change-Id: I087ae575b7d670fa8dacfb80636d813c7bceb41d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When a parent item had its visiblity toggled, then the child item would
not update if the parent item had ItemHasNoContents and
ItemClipsChildrenToShape set. This is a common use case in declarative as
the root item has ItemHasNoContents set.
Task-number: QTBUG-26846
Change-Id: Id6592ebc4ba2caa4331a4a71f7247e40993131b6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 49c251e0543ea80e69d1725bb08bb4dfe3f225ab)
|
|
|
|
|
|
|
|
|
|
|
| |
Add non-opaque fill support for qpa through new QBlittable flag
"AlphaFillRectCapability" and add related implementation in DirectFB
qpa platform.
cherry-picked from qt5/qtbase aab15782e21bf0aaea7f2211278e9aa9fc78c6d7
Change-Id: Ia1c74c2926d2e244290dcb62cbd3b6848ba95707
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
| |
If a merged action is removed then a crash can occur if it is readded
later.
Task-number: QTBUG-24917
Change-Id: I43dcde3f40950fafc33d976e861a90fe1c38d061
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
|
|
|
|
|
| |
Change-Id: Ife18068974227d70c52e7cb0d06e6136827ac562
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
|
|
| |
cherry-picked from qt5/qtbase commit 2b57a8ebfeb6e3495b63fac619631896ca670f11
Change-Id: Idccab648df1a9456a4ee19f1acfdb0544d40a928
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Change-Id: I543274c8f3ebb5f7f6cb8e6fc68cc9ee29050ac6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
According to Qt doc, "Network proxy is not used if the address used in
connectToHost(), bind() or listen() is equivalent to
QHostAddress::LocalHost or QHostAddress::LocalHostIPv6. This is not the
case in current implementation.
cherry-picked from qt5/qtbase commit 5b1bc864a91c3bdb02e36e7546dadebabb42fdec
Change-Id: I20585b4be1149f67f77f02903aac53ee8b140eab
Reviewed-by: Richard J. Moore <rich@kde.org>
|
|
|
|
|
|
| |
Change-Id: I6b7a5b4d698d496a6710dd479b24f10c7d7e5851
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Freeze added exports caused by commit 3c4c9709
(change If5c3701426208875f3b775040c4e7bcbaac2b0a9), to fix Symbian
winscw build break.
Change-Id: Ia8c14d95004e17059af05e91431b71b6767d3885
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Freeze added exports caused by commit c3fe37fe
(change Ie2674e46eb7416b0e753323b673c10f9d3457f6d).
Change-Id: Icca8eff81e62f73639ee7f21b087370dfe501571
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Earlier Qt input hints ImhEmailCharactersOnly and
ImhUrlCharactersOnly were handled in Symbian by function
CAknEdwinState::SetSpecialCharacterTableResourceId.
Along with the new QML touch input any support for this
mechanism has apparently ceased, and the input hint
has no effect. To get '/' to the first page of url editor
virtual keyboard, or '@' to the first page of email editor
virtual keyboard, one has to use function
CAknEdwinState::SetExtensionFlags instead.
Smileys are disabled when these hints are set.
Change-Id: Iec87274da40a7d59c97a479affed7d143dd5aa25
Task-id: ou1cimx1#1012431
Reviewed-by: Marko Kenttälä <ext-marko.r.kenttala@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
| |
It's a follow-up of d7168ae0ff930f19f206a1b56c03fc35b22bb948,
which is doing exactly the same on linux.
Change-Id: Id9eb996d2edf5867491fd420bdf743e0f799a778
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 49fbb6e14af78f751fa114c3cf986aaa607d7408 which
introduced crashes e.g. in Qt Creator. Since the original
change was an optimization, it is reverted in the Qt 4.8 branch
since stability is the main priority there. The crash has been
fixed for the corresponding Qt 5 commit.
It would be an option to recommit the optimization and the
crash fix to a future minor release of Qt 4.
Task-number: QTBUG-27140
Change-Id: I9dc959ea252fe55a22fd90f333ccb335b3ef1311
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
This patch disables rpath and pkg-config because both are not supported by Windows.
The reduce export flag produces linker errors when Dlls are used.
Partial cherry pick from qtbase/07a978d3d4b41739eff1061dc45dbfa737bf78b9
Change-Id: Iee679373397a2f97780876471a138c7bcddd2c7b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
.qmake.cache is not necessarily accessible to other modules which depend on
information about whether we are cross compiling or not. We might as well
advertise this fact globally via the CONFIG variable in qconfig.pri.
Backported qtbase/3c47b52bd37488d41a3ad068de7976c838b7d63c
Change-Id: Ie2566a44fb26e26af97c791e1ed1592fd650dbbd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The compiler prefix could be set optionally by CROSS_COMPILE.
Partial cherry pick from qtbase/2dc3181bdcc0d447d2bec42fa3b7cbecb640a51a
Change-Id: I9a9cc31d7c5fda8b33fe280ee2a90cda0196da7d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
This parial backport only adds the --device-option so it becomes
possible to set and cache additional qmake variables.
Partial cherry pick from qtbase/84e98fd9d2594637e928096c8fcb19d52e5e2676
Change-Id: I96636766aec7e12bfb1d377c8a607301a325a46c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Fixes regression introduced by
aa21fcac3672cc6f0dca064b34bbe02ca4f4def7
Change-Id: Iada496dd8fee390771d8fc12066e93ef086dee90
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: Juhani Taipale <juhani.taipale@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
RIM is committed to supporting Qt on its platforms and the port works
well.
Backport of commit 219ba05b2a43e40feeb2bdebbf53d6da55f2dba2
Change-Id: If34940018036685c6b8dbda193c97b8c50eef1dd
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is basically a backport from Qt5:
- revert the revert: 22995948cd3f46780be5d8016708aeef0cd7b066
- backport from qtbase: 487583459ea7958f24cd579888a662bcce26caf3
this fixes the off-by-one error in the binary search
Task-number: QTBUG-17209
Task-number: QTBUG-231
Change-Id: I7f62fb33cf919ecd7fb2246ae01bb23559e11bf4
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
If the cached state is not dirty and the instanceCount is zero, when the
instanceCount is incremented the cached state will not be correct. To
fix this, reset the cached state to dirty if the instanceCount is
incremented from zero.
Change-Id: Ic49eef7f83b1289a939f998817b1b2b5f5a2a45f
(cherry picked from commit e5ebcbc6343a5d5d815cbbd1812f1f5791b7bc88)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Change-Id: I02400b5c6ad2a5b6a5c6a8ffa9f234f27969e0a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|