| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Reviewed-By: Trust Me
(cherry picked from commit cbdfc6c2f761af6248355bf9bf71ac011d48b14b)
|
|
|
|
|
|
|
|
|
|
| |
The -O2 mode enables omit-frame-pointer & optimize-sibling-calls, which
can break stack traces. So, even in release mode, disable these
optimisations so that we can at least still get a backtrace when a Qt
application dies.
Reviewed-By: Stefano Pironato
(cherry picked from commit c9211c691b370332b9165a9d80f03220789c1d53)
|
|
|
|
|
| |
Reviewed-By: Stefano Pironato
(cherry picked from commit c95acfda6aae0dcf4285bb759a271598bb2dccea)
|
|
|
|
|
|
| |
Reviewed-By: Robert Griebl
Reviewed-By: Thiago Macieira
(cherry picked from commit d0edd9b3d6ee5dba8e9a23d0fb9aaab74924d2ad)
|
|
|
|
|
|
|
|
|
|
|
| |
4.6.0 has the wrong atomics implementation for symbian, as the team
branch was not merged before the freeze.
This updates the def files to match the implementation on the team
branch so that it can be cherry-picked.
Task-number: QTBUG-5752
Reviewed-by: Iain
(cherry picked from commit 0a07ca79318ba1b735ce0b3a208e471e4a24e1f2)
|
|
|
|
|
| |
Reviewed-By: Brad
(cherry picked from commit 99c42254480fb147b0aaa01458300bae4472e3d8)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use ARMv6 atomics where available
Use OS atomics otherwise
Integrate ARMV6 atomics to Symbian builds
Use compiler defined macros to detect if ARMv6 instructions are available
This defines the QT_HAVE_ARMV6 macro, replacing the way it was defined
by the Symbian build system previously in qpainting.pri.
qatomic_symbian now uses qatomic_arm or qatomic_armv6 automatically
Port armv6 atomics to implement generic atomics interface
The inline atomics are not inlined when we build for thumb using RVCT.
So there is no performance improvement of using the "inline" versions vs
a shared version called through a function call.
The generic atomics interface is good for binary compatibility, as the
same symbols are exported in all versions now.
Changed the fallback generic atomics implementation from the unix one
to a symbian specific one using RFastLock (identical code to the windows
generic atomics, except for RFastLock replaces Win32 CRITICAL_SECTION)
Note: GCCE atomics still need porting
Tell git to ignore .lst listing files (produced by sbs/abld listing)
ARMv6 support for GCCE compiler and fallback implementation using OS
When building corelib with GCCE and -march=armv6, QT_HAVE_ARMV6 will be
defined. This patch adds copies of the asm functions in GCC syntax.
When building for the Symbian emulator, or ARMv5, then Symbian OS atomic
functions are used as a fallback - these are more efficient than the unix
atomics, and don't require data import (which the ARMv5 atomics use, but
the OS loader doesn't support fully)
Symbian OS functions are always used for QBasicAtomicInt::ref / deref,
because these are faster than the generic function in all cases.
They are machine coded for ARMv6, and are used internally by RFastLock.
Reviewed-By: axis
Reviewed-By: Brad
(cherry picked from commit a53bbbf81ce2dbce143ebc08fd91418e51a44588)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is basically a copy & paste of the GCC inline assembly above,
switched to the RVCT inline assembly model (which is actually easier
to write and understand).
I verified that this code compiles and assembles as expected. The
output generated by RVCT is pretty much on the mark. However, I have
not executed this code yet to see if it performs as expected.
To be noted:
- when expanding the inline template code, RVCT may be tempted to
switch your entire function to ARM mode. Should we add
__attribute__((noinline)) to prevent that?
- There's no equivalent to GCC inline assembler's clobber, especially
of "memory". Also, there's no "volatile" qualifier to the
assembly. Does the compiler know it can't reorder the code? Does it
know it shouldn't trust the value of the memory after this? My test
indicates the code is fine...
Reviewed-By: Shane Kearns
(cherry picked from commit 43c607383697ab506f9eb0d491ec6348f939e53d)
|
|
|
|
|
|
|
|
|
|
| |
assembly.
Move the *Relaxed, *Acquire and *Release functions (which are simply
forwarding calls to the *Ordered version) to the bottom of the file.
Reviewed-By: Shane Kearns
(cherry picked from commit aeac586476a6e47c7a8a6aa2121bfe39a29d8458)
|
|
|
|
|
|
|
|
| |
(cherry picked from commit edede3b20aa6ffdb16c790f7e537f5b8e9c96e68)
Conflicts:
dist/changes-4.6.0
|
|
|
|
|
|
| |
Task-number: QTBUG-5731
Reviewed-by: jan-arve
(cherry picked from commit 4f2dcef95299f2da628b30607021e8deb1d868b6)
|
|
|
|
|
|
| |
Task-number: QTBUG-5693
Reviewed-by: ogoffart
(cherry picked from commit ad5f41c02daa0278902d0e8273c8cd34efd2d6da)
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 4bf7f90a27377f439e86d6175e5e3cdebd131be0.
The change is already reverted in kinetic-declarativeui.
Reviewed-by: Warwick Allison
Reviewed-by: bnilsen
(cherry picked from commit 5e3f81237aae96181c9315b8e7c6c5368629a000)
|
|
|
|
|
|
| |
Task-number: QTBUG-5663
Reviewed-by: ogoffart
(cherry picked from commit 2321e8636d7436b70a8afcde16828f00c4b8590e)
|
|
|
|
|
|
|
|
| |
The sub-attaq's animation manager was accessing a deleted animation.
Task-number: QTBUG-5646
Reviewed-by: thierry
(cherry picked from commit 75f264cc6c47493f26ee81c783d1f9b64310c1d6)
|
|
|
|
|
|
| |
Task-number: QTBUG-5526
Reviewed-by: thierry
(cherry picked from commit 479e183a2c56eaf65a9734dcd134c534ce5e6642)
|
|
|
|
|
|
| |
Task-number: QTBUG-5640
Reviewed-by: Leo
(cherry picked from commit 6d4acbe94c71f7c0049cd08944855c23a716bee3)
|
|
|
|
|
|
|
|
|
|
|
| |
HP-UX is missing the extern "C" wrapper for its XSync function
declarations. This caused applications to _build_ but not _run_ (i.e.,
all GUI apps crashed). Adding the wrapper should be harmless on all
X11 platforms.
Task-number: QTBUG-5524
Reviewed-by: Thiago
(cherry picked from commit d845505fd57ad4b06499b5b125703e80bbae692a)
|
|
|
|
|
|
|
|
|
| |
All animation api code snippets should use references instead of
local variables.
Task-number: QTBUG-5616
Reviewed-by: thierry
(cherry picked from commit ecdecf7a628aa1c9eb953984c89fc65ffa767a24)
|
|
|
|
|
|
|
|
|
|
| |
After 31f1ff910, posted events could be delayed by a previous call to
processEvents(). This causes some tests to randomly fail, so bring back
the invariant that processEvents() will always call sendPostedEvents() when
called "manually" (i.e. not from exec()).
Reviewed-by: Prasanth Ullattil
(cherry picked from commit fe0f807e1f4e7510c6d8cddd848bcbc25e358651)
|
|
|
|
|
|
|
| |
The word 'module' was missing.
Reviewed-By: TrustMe
(cherry picked from commit 99b19431e6846a36a65f23d21a95140a081d1f1a)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously copy and paste from PDFs made by Qt would paste garbage
into the target document, and searching was not possible. The bug
happened because the internal buffer would open its data stream in
truncate mode rather than append mode, thereby losing content, and
producing a slightly corrupted PDF.
Task: QTBUG-4912
Task: QTBUG-3661
RevBy: Trond Kjernåsen
(cherry picked from commit f7ee0c9efcb6cb36a95f49bc998524e25480f8ba)
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit e029886be27c2434ecfb71f08a0c1a574a1ae533)
|
|
|
|
|
|
| |
Reviewed-by: Trust Me
To-be-reviewed-in: Qt Documentation Team repository
(cherry picked from commit 44523147cb5f3d934bc33e028dfb093edcd2802c)
|
|
|
|
|
|
|
| |
Its using QFontMetrics::width now.
Reviewed-by: thartman
(cherry picked from commit 4e37815e7e3c68ff561ead147cb06898a2db9c75)
|
|
|
|
|
| |
Reviewed-by: thartman
(cherry picked from commit a9576bacae07eb2b8465191a3e537a5659145914)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Missing null check added. Not really a Windows CE only crash.
The following code crashed on all platforms, because the
QGraphicsProxyWidget had no scene yet.
QPushButton *button = new QPushButton;
QGraphicsProxyWidget *buttonProxy = new QGraphicsProxyWidget;
buttonProxy->setWidget(button);
qApp->desktop()->screenGeometry(button);
Task-number: QTBUG-5626
Reviewed-by: Alessandro Portale
(cherry picked from commit 6462303c56349045ce4a9517a7882215b2da929e)
|
|
|
|
|
|
|
| |
Printing shrink factor will be removed from qt 4.6.0.
Reviewed-by: Jocelyn Turcotte
(cherry picked from commit d39104d9b0ce43f872d2880baef8e1cff289adb8)
|
|
|
|
|
| |
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 1212fbea0b6829986649dd1f237e59377f52a6cd)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit 118412e46f5b5af58eaa3012f9fb086894f9b5f2)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit 70490a3f5078f215c905b84fbb11a108dc973a07)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
id.
This fix is similar to KDE change 1027568 by cguthrie.
This commit fixes a bug that was highlighted when devices had been
added/removed or the backend was reloaded.
The AudioDevice used to use a static counter to allocate itself
a device id that was propigated through the Phonon API.
Code in the Backend invalidly assumed that the index
in the list was the same as this id.
(cherry picked from commit 80c24f730c3443e8c05fca374fca365456034fe8)
|
|
|
|
|
|
|
|
|
|
| |
Intergrated KDE change 1040729 by nlecureuil
This bug was already fixed in Qt phonon repo in exactly the same
way, but KDE change is applyed to keep phonon sources in sync.
Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit efc566799797a9088628ac21d83ee2d39805fabc)
|
|
|
|
|
|
|
|
|
| |
Integrated KDE change 1027568 by cguthrie.
This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded.
The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API.
Code in the Backend invalidly assumed that the index in the list was the same as this id.
(cherry picked from commit cc6406d4971c5656fc4b3eb53f96058a9640c6f7)
|
|
|
|
|
|
|
|
|
| |
Integrated KDE change 1027567 by cguthrie.
Glib issues a warning if this is called more than once so we ensure that's what we do.
Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit 88342df1680f2152663ccb2ae0e3b740f4f13ac0)
|
|
|
|
|
|
|
| |
Integrated KDE change 1029491 by nlecureuil
Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit 77a9c7973bd9091a39abe0e03d9b30292a7a2431)
|
|
|
|
|
|
|
|
|
| |
drive noise
Integrated KDE changes 1029492, 1030905 by nlecureuil
Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit 5edc0f87fbad652a8399a43d0520301ed37baaef)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
manager objects on backend destruction.
Integrated KDE change 1027566 by cguthrie.
Normally the backend is only destroyed once when the app exists, but calling gst_deinit()
means that the whole gstreamer system becomes unrecoverable. This means that if
you switch backends away from gstreamer and then back again it will not work.
Gstreamer devs recommend that you do not call gst_deinit() at all except in test cases.
Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit 132ad441481e676cb4e502797c0a4fc833152175)
|
|
|
|
|
| |
Reviewed-By: TrustMe
(cherry picked from commit d429becf4d6e7585e21f5f34dd67241e54351786)
|
|
|
|
|
|
|
|
|
| |
r924855 | mkretz | 2009-02-12 05:49:12 +1000 (Thu, 12 Feb 2009) | 1 line
forwardport: two more adaptor accesses where adaptor might be 0
Reviewed-by: Justin McPherson
(cherry picked from commit 39a5111d292f69ece4deb6c4cd9f294a94c5cf19)
|
|
|
|
|
|
|
|
|
| |
r932546 | thiago | 2009-02-27 07:33:54 +1000 (Fri, 27 Feb 2009) | 1 line
Update copyrights: Trolltech ASA -> Nokia Corporation
Reviewed-by: Justin McPherson
(cherry picked from commit 560d39aafb39c810a77948f04ddcdc568ac2b19d)
|
|
|
|
|
|
|
|
|
| |
r950964 | dfaure | 2009-04-08 19:26:40 +1000 (Wed, 08 Apr 2009) | 2 lines
fix compilation with -DQT_STRICT_ITERATORS
Reviewed-by: Justin McPherson
(cherry picked from commit 7fb34ca0f33c4869a3c7e35401d4b3ad8e77556e)
|
|
|
|
|
|
|
|
|
|
| |
r953828 | tkrotoff | 2009-04-15 01:25:00 +1000 (Wed, 15 Apr 2009) | 1 line
Fix qmath.h include: should be written <QtCore/qmath.h> instead of <qmath.h> in
order to be consistent with the rest of the code that use <QtCore/...>
Reviewed-by: Justin McPherson
(cherry picked from commit 5d11248839cee3e22ebddcaffa2af59b34b37969)
|
|
|
|
|
| |
Fixes: QTBUG-5167
(cherry picked from commit a4053a6e7a9a686433dc4814a5b52da3bc96969f)
|
|
|
|
| |
(cherry picked from commit de76200652e05de34d99f111c64a051a49911034)
|
|
|
|
| |
(cherry picked from commit d1d6769da76a9ff83fd56e12bd331c5e4858ccca)
|
|
|
|
| |
(cherry picked from commit 0f82f5552830485151424b974f282a63892a077d)
|
|
|
|
|
|
|
|
| |
Remember the scale factor so it won't reset each time a new touch sequence
starts.
Reviewed-by: Bradley T. Hughes
(cherry picked from commit 791c4035c28257e5a8426e6519866546faaf5286)
|
|
|
|
|
|
|
| |
QDesktopServices::openUrl expects a proper url, not just a filename.
Reviewed-by: Jedrzej Nowacki
(cherry picked from commit 64946cdc9a5e934132f5c21cbd85e4c21bb5e161)
|
|
|
|
|
| |
Reviewed-by: mauricek
(cherry picked from commit 3569a2c930ee171e4f1e05d0407cee7c971c721d)
|