| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The .gitattributes, .gitignore, .commit-template files do not need to be
present in packaged sources, as they are for people using the Git
repository. People who download tarballs usually don't reimport into
Git -- they should just download the actual repositories.
Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store
the SHA-1 of the commit being packaged.
Change-Id: I9a24a526e66f58ef2ebd9a2319bf96cf43e3e6f7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
When using QBlittable with SourceOverScaledPixmapCapability, rendering
through clipAndDrawPixmap is incorrect when stretching: source pixmap
rectangle has to be corrected using scaling factor.
Change-Id: I80ad1c5ddc73a7b7394d0f5b412931c6279c175a
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If a QWizard is shown when Aero is enabled, the current visual style is
cached in a static member of QVistaHelper. The cached state is updated
by QVistaHelper when it receives WM_THEMECHANGED or
WM_DWMCOMPOSITIONCHANGED events from Windows.
If all QWizard instances are destroyed, there are no instances of
QVistaHelper to receive these notifications and update the cache. If
Aero is now disabled, the cached current visual style in QVistaHelper
isn't updated. If a wizard is now created and shown, a large black
rectangle is shown in the titlebar.
A static instance count is added so that when no wizards are running,
the cached state is not used.
Task-number: QTBUG-27004
Change-Id: Iefe4c8552388280219c9726418ed7476b8ebb15a
(cherry picked from commit 952ea029f40aaff9de0101fc165907ef8693e4aa)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Qt::KeypadModifier modifier is internally masked away from all
shortcuts. So it is not possible to set a keypad only shortcut.
Changed the implementation so that first a full keysequence match is
searched. Then if no match is found the same sequence is tried
without the keypad modifer.
Added a autotest for this also to cover the basic use cases relating
to this.
This is a backport of qt5 commit:
547a1bea492954d828aa0798be93384669812489
Task-number: QTBUG-20191
Change-Id: Ibb6809050ff6da23bdb1c087b93e517d1963d34c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Before, setBoundary was O(N), now it is O(log N) assuming the boundaries
are added in order. (splitItem might still be linear because of the call
to QVector::insert)
This speeds up a lot QTextEngine::addRequiredBoundaries when there is a
lot of addFormats. (For example if there is a very long line with syntax
highlighting)
Task-number: QTBUG-8389
Change-Id: I10c9fca72343f46db24b1d4f519f7747188d4009
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
(cherry picked from commit c13011829fd39661cc9e983256766c6edb88dead)
|
|
|
|
|
|
|
|
|
|
| |
Don't call the linear QTextEngine::format in the loop.
Instead, keep track of the current formats by indexing their start and end position.
Task-number: QTBUG-8389
Change-Id: I89c18b804111edfab6254442cbee33da39d1a273
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
(cherry picked from commit 4f6efe16416f0222ae78ab16c0eb8085bf9c521b)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Or other compilers composed of more than one word (e.g. QNX's compiler
qcc -Vgcc_ntoarmv7le)
Testcase: adding this line at the end of mkspecs/linux-g++-64/qmake.conf
QMAKE_CXX = ccache g++
Result:
fvisibility.test: line 28: ccache g++: command not found
Symbol visibility control disabled.
Result after fix:
Symbol visibility control enabled.
Backport of f1f500b9aa70edfc7511a714c9aefb132d66f10e
Change-Id: If3b0ef2d3ab4e2ff0cb11272ca6d4f8c6ed819b1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
| |
Backport of bf5e3247ae27b89d4a6bdf356a8b15e8f4157918
Change-Id: If953052941b89edda778aa24913f24df0432f50b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Call connectNotify() and disconnectNotify() in QML signal
handlers and in QML bindings.
This is a backport of Qt5's QtDeclarative commit
26ea8e01e9ee2a8c8c09266147b94c9ac92d09f9.
Task-number: QTBUG-11284
Change-Id: If5c3701426208875f3b775040c4e7bcbaac2b0a9
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
| |
It fails on Mountain Lion as well.
Change-Id: I9841e857c1746ed69ccad9dfccf3fb9135e6abde
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
It may happen that InPlaceWidgetHelper's destructor
is called after parent widget destructor. Now inside
InPlaceWidgetHelper's destructor we check if parent
widget still exists.
Task-number: QTCREATORBUG-7684
Change-Id: I4c9ecbfae7323fd95345ccabc113218a7011ebe8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit aad795575646b37b5c531cb6314eaa049e90e076)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When hitting on a child widget that does not accept drops,
go up the hierarchy until the parent is hit or a widget
that accepts drops is found.
Introduced by f6bf4b2baa91e55f40596bf3f2823b119fdfa5e0 .
Task-number: QTBUG-22987
Task-number: QTBUG-27037
Change-Id: I4d9308942c1109c11f7e31555d4ad84fa2610d15
Reviewed-by: Markku Tapio Heikkilä <markku.heikkila@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If you had a QTreeView with expandable items, if you tried to expand and while
the animation was still running you'd try to collpase the node,
the display would be completely broken: the items below that items would
not be visible any more except for a fraction of a second when expanding
or collapsing it again.
The problem is in the fact that when starting an animation the QTreeView
stores the state before animating. And it does that even if an animation
is already running. So the stateBeforeAnimation becomes AnimatingState and
when the animation finishes, AnimatingState is the state that is restored
breaking the painting.
Unit test is included.
qtbase-sha1: 1e97dbaf6ca807397e3ec77a3611763769499d17
Change-Id: I62e16101b70153f78022f6195fd9de6db0cd4878
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
| |
... again.
Change-Id: I0b36c25373bdb3842dd41df598804310e502acb1
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Juhani Taipale <juhani.taipale@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I30537aed87cc793c74588f0220072e97b7232e46
Reviewed-by: Mahdi
Reviewed-by: Abbas Farahmand
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Cherry-picked from qt5/qtbase 4692432b61b09f010a3a7e57e80b9599686fe438
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Change-Id: I1944946b5f17bbf69005d2da30cedff4970f9827
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
| |
Don't attempt to register for events from non-attached screens.
Backport of commit 9597e0d2a23c4673aea7a74598a6a634527c443c
from qt5/qtbase
Change-Id: I95859abc476f43308ba9b2c684b8eaae731c59f6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
When inserting an item on a position that is already occupied, the destructor of the old item was never invoked.
Qt5 SHA1: b4075c8ea31b235cdbb61fcd6290105b9914d627
Change-Id: I842fd81f284d9ca58760bce7e1adfea84da0a788
Reviewed-by: Peter Hartmann <phartmann@rim.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Backport of commits:
fb62fdac1cdb4e26388b5bacc7422ec4579b217e
fe7c600fabdfb1b4cbad624ce7cb736e5edce86d
3ef51efbe75bfb9f1dfbe7df073e9eb745a72ad8
47fd7128dba4c38ff1bfcc517fec0f063fb90e4c
Change-Id: Ibcb13ebb2e6cb05ab381328228eca5abdde52ad9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
| |
An implementation for BlackBerry devices based on the BPS netstatus APIs.
cherry-picked from qtbase df7a1a28aaab31
Change-Id: I979f594aca64315af1f39e68886b819f7f215f6b
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Vladimir Minenko <vminenko@rim.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Apparently it depends on the user and/or firmware version on whether
TMPDIR or TEMP is set, so try both.
Additionally, fall back to /tmp if neither is set, as that seems to be
present on all devices.
This is a backport of a135d87a0f8ec24445e13fb54f4316e4ca7473be from
Qt5.
Change-Id: I1637f4ab74c8c8bd350b4efb451c2143c0642796
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Allow for a little more leeway in timers.
Task-number: QTBUG-26004
Change-Id: I59936d0f675b7f734e04b3f5e63631c74ca4f163
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
(cherry picked from commit 4eecbf3b842afcfb91d78552ce19d2c0b8f8c53a)
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QGLGlyphCache::cacheGlyphs function reallocates a larger texture
when there is no more room to insert a newly rendered glyph. However,
the glyph width used to check whether reallocation is needed is not the
same as the actual glyph image width and may be less. When the glyph
image is then copied into the texture, a buffer overrun may occur.
Task-number: QTBUG-23584
Change-Id: I71d6cd987b7519e5235109c14a5a35e452332417
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If setQObjectShared crashes because a QObject is tracked by two
different QSharedPointers, we lose the debug feature offered by #defining
QT_SHAREDPOINTER_TRACK_POINTERS, as the check done by this define
happens after the setQObjectShared call.
Therefore, move setQObjectShared after the internalSafetyCheckAdd2 call.
This way, the error raised by QSharedPointer created changes from f.i.
QSharedPointer: pointer 0xa10010 already has reference counting
to the more "debuggable" (and consistent with non-QObjects)
QSharedPointer: internal self-check failed: pointer 0x1dd90e0 was already tracked by another QSharedPointer object 0x1dd9330
"Backport" of change-id I71340d0f878828354537762d01c46d441efc918c from
qtbase (although, as of commit 609b0a9c2e69180ceff5d89c42e0d9468491d7e3,
this issue is not present there, as setQObjectShared does nothing).
Change-Id: I4cea83d705795eae0e05da128a3f189aea36f5ce
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
| |
This is a backport of 799ceebad8a2dbe1ca0e60a11c7d6ca0c2c8b7a9 from
qtbase.
Task-number: QTBUG-21804
Change-Id: I757b9598f354cdfa62c08d0c2613ded93fe88804
Reviewed-by: Jani Honkonen <jani.honkonen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
| |
Change-Id: Ibb5165f3f4ac4aca23cf28a504b8ef7179b018b1
Reviewed-by: Andras Becsi <andras.becsi@nokia.com>
|
|
|
|
|
|
|
| |
This test has been passing for some time now.
Change-Id: I8d03e3af184645b89b8a2e81be7d4bc5be14816e
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
|
|
|
|
|
|
|
|
| |
This mark does not have any effect as the real mark is under
tests/auto/selftests/test/test.pro
Change-Id: I8885e6921940d0652326934dd1acc2d0cd3bc7a0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|
|
|
|
|
|
| |
This test has been passing for some time now.
Change-Id: If33c0a4b675f6ab331fa64709c2c8c8f3f3ffb4e
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
|
|
|
|
|
| |
Change-Id: I3442592b903afa99e85953cdf40b91b914963a8b
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Adapted _q_parseUnixDir to handle yearless date strings during
a leap year while performing LIST.
Task-number: QTBUG-26911
Change-Id: I3193400a274a896530d45de986ec8fa5b159abb4
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Philip Van Hoof <philip@codeminded.be>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Developers expect const methods on the same QUrl instance to be usable
from multiple threads (including copying and modifying the copy).
The delayed parsing and internal cache of encoded strings break this, however
(and the implicit sharing, for the case of copying).
Protection with a mutex fixes this.
Qt-5.0 doesn't have this issue, since QUrl doesn't do delayed parsing
anymore.
Change-Id: Ie2674e46eb7416b0e753323b673c10f9d3457f6d
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The listitem width was calculated incorrectly because spacing was
not considered. This fixes the second part of the reported bug where
spacing is set. Added some tests to catch the issue relating to the
reported bug.
Also added a test to check spacing in general.
Backported from Qt5 commit:
d2bba5e5535726f277e8dc67b1478168f57b24bd
Task-number: QTBUG-21804
Change-Id: I20cae3a2b9d42650052441f9f15b43f72418f58b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QWindowsVistaStyle::drawPrimitive() method was trying to draw the
pixmap for an item in an item view even if the section width was zero
or less then zero. This resulted "QPainter::begin: Paint device
returned engine == 0, type: 2" error.
It's now checked that the width and the height of the section is
greater than zero before creating the painter.
Task-number: QTBUG-26047
Change-Id: I36dd2792fd505be773951e5ac36b0e3362ec2292
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 929e934969c621d7c1773e4233c14d358de4d385)
|
|
|
|
|
| |
Change-Id: Iec3efb4b91bdba33fe93b928ff2349440e15aa35
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@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>
|
|
|
|
|
|
|
|
| |
The test has two unstable failures, so mark these with QEXPECT_FAIL
Task-number: QTBUG-26905
Change-Id: I1912626376f70ae6d645638fb5b07dbf9e4c3393
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
|
|
|
|
|
|
|
| |
Broke with baeb42184402454da3e337bbfa2f4d5c7346435f
Change-Id: Ia8d844b7b4b9815a1cce4a1acccdbe515149d3ea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|