summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tst_qtextcodec: Fix broken merge conflict resolutionOlivier Goffart2010-05-281-1/+1
|
* tst_qtextcodec: Fix broken merge conflict resolutionThiago Macieira2010-05-281-2/+2
|
* Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-2840-929/+1335
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Added some changes for 4.6.3 Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined. Allow auto-test to compile when using namespaces Fix regression in QVarLengthArray::operator= Removed unnecessary PlatSec capabilities from spectrum demo DLL Make test work with shadow builds again. Added missing PlatSec capabilities to spectrum demo DLL My 4.6.3 changes Tidy changes file for 4.6.3. My 4.6.3 changes My 4.6.3 changes 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 Qt app draws background incorrectly when animated wallpaper is used Don't use QAtomicInt in statics because they are non-POD. QTBUG-5955: Qt fails to build on alpha architecture
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-2740-929/+1335
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/spectrum/app/engine.h demos/spectrum/app/mainwidget.h demos/spectrum/app/settingsdialog.h demos/spectrum/app/spectrograph.h demos/spectrum/app/spectrumanalyser.h demos/spectrum/app/tonegenerator.h demos/spectrum/app/tonegeneratordialog.h demos/spectrum/app/utils.h demos/spectrum/app/waveform.h tests/auto/qtextcodec/tst_qtextcodec.cpp
| | * 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.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2811-48/+85
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Active window focus gain should not open virtual keypad Use QElapsedTimer rather than QTime::elapsed()
| * | | | | Active window focus gain should not open virtual keypadJoona Petrell2010-05-285-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-28209-1644/+2959
| |\ \ \ \ \
| * | | | | | Use QElapsedTimer rather than QTime::elapsed()Martin Jones2010-05-286-42/+58
| | | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-288-102/+146
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Wrong QGraphicsItem::childrenBoundingRect() when applying effects. Fix a bug in QDirectFBPixmapData::fromImage Replace memmove with memcpy Fixed compilation of QtOpenGL. Optimize initialization of QStaticText
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-278-102/+146
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Wrong QGraphicsItem::childrenBoundingRect() when applying effects. Fix a bug in QDirectFBPixmapData::fromImage Replace memmove with memcpy Fixed compilation of QtOpenGL. Optimize initialization of QStaticText
| | * | | | | | | Wrong QGraphicsItem::childrenBoundingRect() when applying effects.Bjørn Erik Nilsen2010-05-272-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that we used the children's raw bounding rect instead of using their effective bounding rect when calculating the bounds. Auto test included. Task-number: QTBUG-10756
| | * | | | | | | Fix a bug in QDirectFBPixmapData::fromImageAnders Bakken2010-05-272-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every image that was converted with flags & Qt::NoOpaqueDetection would be considered to have an alpha channel. This patch fixes that and simplifies the code a little. Merge-request: 637 Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
| | * | | | | | | Replace memmove with memcpyEskil Abrahamsen Blomfeldt2010-05-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qMemCopy is faster than memmove, and there's no chance of overlapping source and destination memory in these cases. Reviewed-by: Samuel
| | * | | | | | | Fixed compilation of QtOpenGL.Samuel Rødal2010-05-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Eskil
| | * | | | | | | Optimize initialization of QStaticTextEskil Abrahamsen Blomfeldt2010-05-272-81/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QStaticText would be created once and used often, not much thought was put into optimizing its initialization. For simplicity, the code would do two drawText() passes. Since this was an unnecessary overhead, the extra pass has been removed and replaced by memmoves instead. Initialization is now twice as fast. Reviewed-by: Samuel
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-2810-83/+103
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix escaping - by not using eval escape backslashes in QMAKE_PRL_LIBS fix & unify path separator escaping Removed unused variable Upgrade harfbuzz to the latest version
| * | | | | | | | fix escaping - by not using evalOswald Buddenhagen2010-05-273-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the left-hand-side of qmake assignments is expanded, so there is no need to use eval.
| * | | | | | | | escape backslashes in QMAKE_PRL_LIBSOswald Buddenhagen2010-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they may contain (absolute) windows paths, which need escaping now. Reviewed-by: mauricek
| * | | | | | | | fix & unify path separator escapingOswald Buddenhagen2010-05-273-49/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mauricek
| * | | | | | | | Removed unused variableThorbjørn Lindeijer2010-05-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
generated by cgit v0.12 at 2025-08-26 03:41:08 (GMT)