summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* test QMultiMap::operator+= and QMultiHash::operator+=Olivier Goffart2010-05-282-0/+40
|
* QMultiMap/QMultiHash: must qualify identifier to find this declaration in ↵Olivier Goffart2010-05-282-14/+4
| | | | | | | | | | dependent base class This is required as some compiler such as clang or rvct respect the standard more than gcc Reviewed-by: thiago Reviewed-by: hjk
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-273-4/+7
|\ | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix regression with Qt::AlignRight on monospaced text in QTextLayout Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95f
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-273-4/+7
| |\ | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix regression with Qt::AlignRight on monospaced text in QTextLayout Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95f
| | * Fix regression with Qt::AlignRight on monospaced text in QTextLayoutEskil Abrahamsen Blomfeldt2010-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For monospaced fonts, using the width (including the bearing) of the text to align it to the right hand side, will break alignment of columns of characters. To fix the problem, we go back to the old procedure, by using the advance of the text as basis of alignment instead. Done-by: thorbjorn Reviewed-by: Eskil
| | * Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95fEskil Abrahamsen Blomfeldt2010-05-273-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes right alignment of monospaced text, which was a regression in Qt 4.6.0. Initially it was fixed in Qt 4.7 only, but the regression was later deemed severe enough to fix in 4.6.x as well. Task-number: QTBUG-8864 Reviewed-by: thorbjorn
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-272-1/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Post QResizeEvent from QSymbianControl::SizeChanged even when invisible Moved Symbian-specific .pro directive into symbian{} block
| * | Post QResizeEvent from QSymbianControl::SizeChanged even when invisibleGareth Stockwell2010-05-271-0/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-10986 Reviewed-by: Jason Barron
| * | Moved Symbian-specific .pro directive into symbian{} blockGareth Stockwell2010-05-271-1/+2
| | | | | | | | | | | | Reviewed-by: Miikka Heikkinen
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-271-0/+24
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added some changes for 4.6.3
| * | Added some changes for 4.6.3Jens Bache-Wiig2010-05-271-0/+24
| | |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-271-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.
| * | | Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.Liang Qi2010-05-271-0/+4
| | | |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-262-8/+305
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Allow auto-test to compile when using namespaces Fix regression in QVarLengthArray::operator=
| * | | Allow auto-test to compile when using namespacesJoão Abecasis2010-05-261-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-test added in 8060094144d6104659b8ce3b88d6f8b1e53cfb59 does not compile when using Qt in namespace, because Q_DECLARE_TYPEINFO needs to be used from inside QT_NAMESPACE. Wrapper macros added. Task-number: QTBUG-10978
| * | | Fix regression in QVarLengthArray::operator=João Abecasis2010-05-262-8/+304
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a serious regression wherei, under certain conditions, assignment would be treated as an append. This was due to poor tracking of container invariants inside realloc. From now on, after the allocation decision, s shall contain the number of elements in the array to be kept. Deleting extra elements in the old array needn't update this value. Instead, it needs to be updated once and if new elements are created afterwards. Auto-test greatly expanded to avoid future embarassments. Task-number: QTBUG-10978 Reviewed-by: Olivier Goffart Reviewed-by: Fabien Freling Olivier reviewed the patch, Fabien the auto-test.
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-261-0/+45
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: My 4.6.3 changes
| * | My 4.6.3 changesSami Merila2010-05-261-0/+45
| | |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-262-1/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed unnecessary PlatSec capabilities from spectrum demo DLL Added missing PlatSec capabilities to spectrum demo DLL
| * | Removed unnecessary PlatSec capabilities from spectrum demo DLLGareth Stockwell2010-05-262-2/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-10964 Reviewed-by: Miikka Heikkinen
| * | Added missing PlatSec capabilities to spectrum demo DLLGareth Stockwell2010-05-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Symbian, spectrum.exe has UserEnvironment capability in order to allow it to use QAudioInput. This means that the capabilities of any DLL which it loads must include UserEnvironment. Prior to this patch, fftreal.dll was built without any capabilities, causing startup of the application to fail. Although granting only UserEnvironment to fftreal.dll would fix the bug, the usual pattern on Symbian OS is to grant 'all -tcb' capabilities to DLLs. The capabilities with which the DLL actually runs are inherited from its parent process. Task-number: QTBUG-10964 Reviewed-by: Liang Qi
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-261-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make test work with shadow builds again.
| * | | Make test work with shadow builds again.Andreas Aardal Hanssen2010-05-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken by 0cdf33e9acb00b8f3654e8268253a3fb7c5db92c, which assumes the binary and sources are in the same directory. The fix reverts the code back to how it was in 4.5 (where it still works with shadow builds). Reviewed-by: Denis Dzyubenko
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-261-181/+179
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Tidy changes file for 4.6.3. My 4.6.3 changes
| * | | Tidy changes file for 4.6.3.Jason McDonald2010-05-261-219/+137
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | My 4.6.3 changesMiikka Heikkinen2010-05-261-4/+84
|/ / / | | | | | | | | | Reviewed-by: TrustMe
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-262-4/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: My 4.6.3 changes Don't use QAtomicInt in statics because they are non-POD.
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Gareth Stockwell2010-05-251-0/+8
| |\ \ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-251-4/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Don't use QAtomicInt in statics because they are non-POD.
| * | | | | My 4.6.3 changesGareth Stockwell2010-05-251-0/+6
| | |/ / / | |/| | |
| * | | | Don't use QAtomicInt in statics because they are non-POD.Thiago Macieira2010-05-251-4/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Olivier Goffart
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-2530-714/+760
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian. Build fix for spectrum demo when -qtnamespace is used Fixed license headers in spectrum demo
| * | | Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.Liang Qi2010-05-252-2/+17
| | | |
| * | | Build fix for spectrum demo when -qtnamespace is usedGareth Stockwell2010-05-259-24/+27
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10881 Reviewed-by: Liang Qi
| * | | Fixed license headers in spectrum demoGareth Stockwell2010-05-2528-688/+716
|/ / / | | | | | | | | | | | | Reviewed-by: Jason McDonald Task-number: QTBUG-10887
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-251-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Qt app draws background incorrectly when animated wallpaper is used
| * | | Qt app draws background incorrectly when animated wallpaper is usedSami Merila2010-05-251-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian^3 OS supports animated wallpapers. Unfortunately animation is drawn to separate surface underneath the application surface. To avoid fiddling with system surfaces, Qt apps indicate to the OS that application does not support animated wallpaper and thus, system draws a "regular" wallpaper for the application. This feature is supported only in Sym^3. Task-number: QT-3148 Reviewed-by: Shane Kearns
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-252-7/+12
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QTBUG-5955: Qt fails to build on alpha architecture
| * | | QTBUG-5955: Qt fails to build on alpha architectureFathi Boudra2010-05-252-7/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | - add alpha platform support based on JavaScriptCore from src/3rdparty/webkit copy. - fix invalid type conversions on alpha architecture. Merge-request: 640 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-244-35/+84
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a race condition with QtDBus blocking for replies. QtDBus: Debug message update
| * | Fix a race condition with QtDBus blocking for replies.Thiago Macieira2010-05-244-34/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an auxiliary thread tried to block on waiting for a reply, and at the same time the main thread handled the reply, there's room for a race condition. So ensure only one thread is stopped at dbus_pending_call_block(). The other thread(s) will be waiting on the QWaitCondition. It's not a race condition for the main thread to process (and finish processing) the reply while the auxiliary thread hasn't even started to wait. The code will ensure that the reply is properly seen. Task-Id: https://projects.maemo.org/bugzilla/show_bug.cgi?id=155306 Reviewed-By: Trust Me
| * | QtDBus: Debug message updateThiago Macieira2010-05-241-1/+1
| | |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-213-14/+19
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed DEPLOYMENT from demos/spectrum/spectrum.pro Install source for spectrum demo Fixed path for copying launcher script for spectrum demo
| * | Removed DEPLOYMENT from demos/spectrum/spectrum.proGareth Stockwell2010-05-211-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | DEPLOYMENT was added to demos/spectrum/spectrum.pro as a workaround for QTBUG-5312, in order to allow 'make sis' to be executed from the demos/spectrum directory. While this workaround is OK for SBSv2, it causes a build failure when using SBSv1. Task-number: QTBUG-10833
| * | Install source for spectrum demoGareth Stockwell2010-05-213-0/+18
| | | | | | | | | | | | | | | Task-number: QTBUG-10880 Reviewed-by: Thomas Zander
| * | Fixed path for copying launcher script for spectrum demoGareth Stockwell2010-05-211-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-10879 Reviewed-by: Thomas Zander
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-213-15/+88
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed an assert in QMenu Call eglTerminate() when the last QEglContext is destroyed to free mem.
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-213-15/+88
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed an assert in QMenu Call eglTerminate() when the last QEglContext is destroyed to free mem.
| | * | Fixed an assert in QMenuThierry Bastian2010-05-212-11/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was changed and changed the behaviour. This is basically a kind of revert. Reviewed-By: gabi Task-Number: QTBUG-10735
| | * | Call eglTerminate() when the last QEglContext is destroyed to free mem.Trond Kjernåsen2010-05-211-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We never called eglTerminate() to free memory allocated by eglInitialize() since it was a fixed allocation that would be used for the lifetime of an application. The new behavior is to call eglTerminate() when the last EGL context in the app is destroyed. Task-number: QT-3383 Reviewed-by: Rhys Weatherley
generated by cgit v0.12 at 2025-01-15 22:08:17 (GMT)