summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update the testlib XML baselines with the unit names from QTestLibThiago Macieira2010-04-296-24/+24
|
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-29131-709/+1025
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All EGL-related changes from 4.6 were discarded. Conflicts: src/gui/egl/egl.pri src/gui/egl/qegl.cpp src/gui/egl/qegl_p.h src/gui/egl/qegl_stub.cpp src/gui/egl/qeglproperties_p.h src/gui/egl/qeglproperties_stub.cpp src/gui/gui.pro src/multimedia/multimedia/audio/qaudioinput_win32_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-281-11/+84
| |\ | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_selftest: parse benchlib results in XML format too tst_selftests: replace a line number with __LINE__ in XML too
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-281-11/+84
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_selftest: parse benchlib results in XML format too tst_selftests: replace a line number with __LINE__ in XML too
| | | * tst_selftest: parse benchlib results in XML format tooThiago Macieira2010-04-281-1/+67
| | | |
| | | * tst_selftests: replace a line number with __LINE__ in XML tooThiago Macieira2010-04-281-10/+17
| | | |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-284-46/+46
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Renaming a few unexported, private symbols
| | * | Renaming a few unexported, private symbolsAlessandro Portale2010-04-284-46/+46
| |/ / | | | | | | | | | | | | | | | | | | | | | That reduces the delta between 4.6/4.7 and a patch that I am pre- paring for Symbian^4. The renaming will help me a lot when main- taining font issues on 4.6 and 4.7 and different Symbian versions. Reviewed-by: trustme
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-282-18/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed fullscreen responsiveness of softkeys
| | * | Removed fullscreen responsiveness of softkeysMiikka Heikkinen2010-04-282-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CEikCba class casting is not binary compatible between at least S60 3.2 and 5.0 platforms, even though it is source compatible. The removed code was causing stack corruption on emulator when binaries were built on S60 3.2 SDK and run on S60 5.0 SDK. Another solution for this feature needs to be found. Task-number: QTBUG-10199 Reviewed-by: Shane Kearns Reviewed-by: Janne Anttila
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-2894-187/+187
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_selftest: use @INSERT_QT_VERSION_HERE@ to indicate the Qt version.
| | * | tst_selftest: use @INSERT_QT_VERSION_HERE@ to indicate the Qt version.Thiago Macieira2010-04-2894-187/+187
| |/ / | | | | | | | | | Otherwise, the tests break when the Qt version changes
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-274-4/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix crash in QXmlStreamReader
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-274-4/+16
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix crash in QXmlStreamReader
| | | * | fix crash in QXmlStreamReaderPeter Hartmann2010-04-274-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this fixes a possible off-by-one data corruption which apparently is only triggered in rare circumstances. The problem was: We were checking whether we would need to reallocate the stack (line 1245), but sometimes were incrementing tos (line 1278) and then accessing the state stack at an out-of-bounds position (line 1951). Additionally, adapt the qlalr generator for changes made to qxmlstream_p.h directly and recreate that file with qlalr. Reviewed-by: Frans Englich Reviewed-by: Roberto Raggi Task-number: QTBUG-9196
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-271-32/+1
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: The cmd line arguments have not been delegated properly.
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-271-32/+1
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: The cmd line arguments have not been delegated properly.
| | * | The cmd line arguments have not been delegated properly.Aleksandar Sasha Babic2010-04-271-32/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QT-9377 Reviewed-by: Joao
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-271-3/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed a QFontEngine leak for QFont objects used in threads.
| | * | | Fixed a QFontEngine leak for QFont objects used in threads.Trond Kjernåsen2010-04-271-3/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the QFontCache object for the main thread was cleared when the the application exited, or a thread was destroyed. This caused font engine references to hang around and never get deleted. Task-number: QTBUG-3976 Reviewed-by: Brad
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-271-2/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed QGLWidget::grabFrameBuffer() to honor the 'withAlpha' value.
| | * | | Fixed QGLWidget::grabFrameBuffer() to honor the 'withAlpha' value.Trond Kjernåsen2010-04-271-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7545 Reviewed-by: Kim
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-271-235/+282
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Adjusted layout of audiodevice example to use scrollbar.
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-2724-199/+1172
| | |\ \ \
| | * | | | Adjusted layout of audiodevice example to use scrollbar.Kurt Korbatits2010-04-271-235/+282
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Justin McPherson
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-278-34/+104
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QXmlSchema internals: fix crash with anonymous types QNAM HTTP: Fix invoking a method when being destructed right now (2) QNAM: Use a reference in appendDownstreamData QNAM HTTP: Divide QNetworkReplyImplPrivate::appendDownstreamData QNAM HTTP: Avoid one copy
| | * | | | QXmlSchema internals: fix crash with anonymous typesPeter Hartmann2010-04-263-5/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash occurred when an anonymous type was created that was a list type. In that case, we did not set the item type, which is used later at XsdSchemaChecker::checkSimpleDerivationRestrictions(), which would lead to a crash. Additionally, in the xmlpatternsvalidator test, check the exit status of the process after it has finished, to detect crashes. Reviewed-by: Tobias Koenig <tokoe@kde.org> Reviewed-by: Frans Englich Task-number: QTBUG-8920
| | * | | | QNAM HTTP: Fix invoking a method when being destructed right now (2)Markus Goetz2010-04-261-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10171 Reviewed-by: Olivier Goffart
| | * | | | QNAM: Use a reference in appendDownstreamDataMarkus Goetz2010-04-262-2/+2
| | | | | |
| | * | | | QNAM HTTP: Divide QNetworkReplyImplPrivate::appendDownstreamDataMarkus Goetz2010-04-262-25/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The goal is to easier add an overload for (const &QByteArray). Reviewed-by: Peter Hartmann
| | * | | | QNAM HTTP: Avoid one copyMarkus Goetz2010-04-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if we have implicit sharing in QByteArray it makes sense. Reviewed-by: joao
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-264-78/+67
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: win32 backend for low-level audio fixes
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-26226-149738/+229017
| | |\ \ \ \
| | * | | | | win32 backend for low-level audio fixesKurt Korbatits2010-04-264-78/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix deadlock with QAudioInput (win32) backend - changed win32 backend to use QMutex lock - setNotifyInterval(0) to disable notify() signal Reviewed-by:Derick Hawcroft
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-265-2/+45
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Re-apply change 5107946e97cbc480a9329565c29b7384c8ba0860 by Iain Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 4fb414b38f7c7c8439ce6a4323f1acb057a3ff20 )
| | * | | | | Re-apply change 5107946e97cbc480a9329565c29b7384c8ba0860 by IainIain2010-04-262-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply change f14ae11e6731bd7416f45c3ef7ce464587862223 by Iain Update WebKit DEF files on Symbian Add/absent function with altered signature to BWINS DEF file. Correct ordinal numbering in EABI DEF file, it was broken and causing the build to fail. Reviewed-by: TrustMe
| | * | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-04-267-5/+47
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 4fb414b38f7c7c8439ce6a4323f1acb057a3ff20 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-04-26 Thiago Macieira <thiago.macieira@nokia.com> Reviewed by Simon Hausmann. [Qt] Fix the include header <qstring.h> -> <QtCore/qstring.h> The module/header.h style inclusion removes the need to have -I$QTDIR/include/depending-module in the include search path for the application. * Api/qwebkitversion.h:
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-262-16/+34
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix infinite recursion in QIconvCodec when iconv fails. Fix the use of strerror_r on GNU libc systems.
| | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-262-16/+34
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix infinite recursion in QIconvCodec when iconv fails. Fix the use of strerror_r on GNU libc systems.
| | | * | | | | Fix infinite recursion in QIconvCodec when iconv fails.Thiago Macieira2010-04-261-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We mustn't use to/fromAscii because that goes back into the iconv codec... Task-number: QTBUG-10189 Reviewed-by: Olivier Goffart
| | | * | | | | Fix the use of strerror_r on GNU libc systems.Thiago Macieira2010-04-261-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10014 Reviewed-By: Olivier Goffart
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-262-11/+38
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: Menu separators are not drawn, yet they take up screen space QS60Style: QMenu behaves badly with a lot of menu items
| | * | | | | QS60Style: Menu separators are not drawn, yet they take up screen spaceSami Merila2010-04-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, QS60Style does not draw menu separators at all, yet they are calculated to take screen estate. Remove the screen reservation from them. See also QTBUG-10054 for details to add menu separator support to style. Task-number: QTBUG-10191 Reviewed-by: Alessandro Portale
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-04-2613-133/+960
| | |\ \ \ \ \
| | * | | | | | QS60Style: QMenu behaves badly with a lot of menu itemsSami Merila2010-04-262-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to recent change in QS60Style where combobox menu was changed to popup menu, instead of dropdown menu, long QMenus now work sloppily. This is due to that pixel metric PE_MenuScrollerHeight was set to zero to avoid "non-drawn" areas in combobox popups. Of course, QMenu scrolling really needs the scrolling area if it is to make any scrolling. As a solution, scroller height is now zero for combobox popup and in QMenu it is the height of itemview item (for "standard" content), but no any scroller indication is drawn. The menu scrolls automatically when bottom/top part of menu list is highlighted. Task-number: QTBUG-10073 Reviewed-by: Janne Koskinen
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-239-120/+904
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix for EGL for symbian on 3.1/3.2/5.0, define QT_NO_EGL. stub implementations for EGL for symbian
| | * | | | | | Fix for EGL for symbian on 3.1/3.2/5.0, define QT_NO_EGL.Liang Qi2010-04-234-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jason Barron
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-237-118/+879
| | |\ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: stub implementations for EGL for symbian
| | * | | | | | stub implementations for EGL for symbianShane Kearns2010-04-237-118/+879
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done to keep binary compatibility between Qt built with openvg vs Qt built without openvg support. The problem is that Symbian uses .def files to map between exported symbol names and ordinals in the DLL export table. The alternative of manually maintaining two versions of the QtGui def files proved to be too error prone and time consuming. Note that the EGL exports are defined in a private header, for use by the openvg and opengl graphics system plugins. These plugins should always be compiled against Qt configured with support for the graphics system, as the headers contain default parameters which are inlined into the plugin binary. Task-number: QTBUG-7870 Reviewed-by: Tom Cooksey
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-234-13/+56
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed two problems with generated EPS files. tst_qlineedit: add contains(QT_CONFIG,qt3support) to the .pro file to make it compile Fix regression: auto completion text cursor problem in Q3FileDialog
generated by cgit v0.12 at 2025-01-23 00:31:08 (GMT)