summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-28Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System1-2/+2
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Handle exceptions notified by select before read/write.
2010-05-28Handle exceptions notified by select before read/write.Janne Anttila1-2/+2
Task-number: MOBILITY-800 Reviewed-by: Aleksandar Sasha Babic
2010-05-28Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2-58/+63
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added support for Indonesian language on Symbian. Fix for Norwegian and Korean languages on symbian. Added Korean and Nynorsk locales support on Symbian.
2010-05-28Added support for Indonesian language on Symbian.Denis Dzyubenko1-1/+2
We have support for ELangIndonesian, but we also need to support new ELangIndonesian_Apac which has appeared in Symbian^3. Task-number: QT-3369 Reviewed-by: trustme
2010-05-28Fix for Norwegian and Korean languages on symbian.Denis Dzyubenko2-60/+62
Last commits added Norwegian Nynorsk and Korean locales support, however the array that contains the mapping between symbian locale constant and locale string should be sorted to work. Task-number: QT-3368 Task-number: QT-3370 Reviewed-by: trustme
2010-05-28Added Korean and Nynorsk locales support on Symbian.Denis Dzyubenko1-0/+2
Task-number: QT-3368 Task-number: QT-3370 Reviewed-by: Thiago Macieira
2010-05-28Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System1-0/+41
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add missing license header.
2010-05-28Add missing license header.Jason McDonald1-0/+41
Reviewed-by: Trust Me
2010-05-27Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2-9/+20
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixes for the s60theme tool
2010-05-27Fixes for the s60theme toolAlessandro Portale2-9/+20
The main app did not return an error code but rather a int-converted boolean. When loading from .tdf files, the tool will now search for .svg files directly, if the part is not found in the .tdf file. Task-number: QTSIM-9
2010-05-27Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System3-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
2010-05-27Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2-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
2010-05-27Post QResizeEvent from QSymbianControl::SizeChanged even when invisibleGareth Stockwell1-0/+3
Task-number: QTBUG-10986 Reviewed-by: Jason Barron
2010-05-27Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System3-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
2010-05-27Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System1-0/+24
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added some changes for 4.6.3
2010-05-27Moved Symbian-specific .pro directive into symbian{} blockGareth Stockwell1-1/+2
Reviewed-by: Miikka Heikkinen
2010-05-27Fix regression with Qt::AlignRight on monospaced text in QTextLayoutEskil Abrahamsen Blomfeldt1-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
2010-05-27Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95fEskil Abrahamsen Blomfeldt3-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
2010-05-27Added some changes for 4.6.3Jens Bache-Wiig1-0/+24
2010-05-27Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System1-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.
2010-05-27Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.Liang Qi1-0/+4
2010-05-27Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2-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=
2010-05-27Allow auto-test to compile when using namespacesJoão Abecasis1-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
2010-05-26Fix regression in QVarLengthArray::operator=João Abecasis2-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.
2010-05-26Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System1-0/+45
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: My 4.6.3 changes
2010-05-26Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2-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
2010-05-26Removed unnecessary PlatSec capabilities from spectrum demo DLLGareth Stockwell2-2/+2
Task-number: QTBUG-10964 Reviewed-by: Miikka Heikkinen
2010-05-26Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System1-4/+4
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make test work with shadow builds again.
2010-05-26Make test work with shadow builds again.Andreas Aardal Hanssen1-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
2010-05-26Added missing PlatSec capabilities to spectrum demo DLLGareth Stockwell1-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
2010-05-26My 4.6.3 changesSami Merila1-0/+45
2010-05-26Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System1-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
2010-05-26Tidy changes file for 4.6.3.Jason McDonald1-219/+137
Reviewed-by: Trust Me
2010-05-26My 4.6.3 changesMiikka Heikkinen1-4/+84
Reviewed-by: TrustMe
2010-05-26Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2-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.
2010-05-26Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System30-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
2010-05-25Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Gareth Stockwell1-0/+8
2010-05-25My 4.6.3 changesGareth Stockwell1-0/+6
2010-05-25Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.Liang Qi2-2/+17
2010-05-25Build fix for spectrum demo when -qtnamespace is usedGareth Stockwell9-24/+27
Task-number: QTBUG-10881 Reviewed-by: Liang Qi
2010-05-25Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System1-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.
2010-05-25Fixed license headers in spectrum demoGareth Stockwell28-688/+716
Reviewed-by: Jason McDonald Task-number: QTBUG-10887
2010-05-25Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System1-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
2010-05-25Qt app draws background incorrectly when animated wallpaper is usedSami Merila1-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
2010-05-25Don't use QAtomicInt in statics because they are non-POD.Thiago Macieira1-4/+4
Reviewed-By: Olivier Goffart
2010-05-25Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2-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
2010-05-25QTBUG-5955: Qt fails to build on alpha architectureFathi Boudra2-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>
2010-05-24Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System4-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
2010-05-24Fix a race condition with QtDBus blocking for replies.Thiago Macieira4-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
2010-05-24QtDBus: Debug message updateThiago Macieira1-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 06:47:08 +0000