summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
...
* Patch to QTBUG-3168Carolina Gomes2010-02-251-5/+22
| | | | | | | Patch to QTBUG-3168 and update tst_qurl to enable the test case that was skipped. Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-241-0/+7
|\ | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: More pedantry. Fix grammar. Doc: QFutureWatcher: specify that calls to setFuture should happen after the connections
| * More pedantry.Trond Kjernåsen2010-02-241-2/+2
| | | | | | | | Reviewed-by: Kim
| * Fix grammar.Trond Kjernåsen2010-02-241-2/+3
| | | | | | | | Reviewed-by: Kim
| * Doc: QFutureWatcher: specify that calls to setFuture should happen after the ↵Olivier Goffart2010-02-241-0/+6
| | | | | | | | | | | | connections Reviewed-by: Morten Sorvig
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-234-9/+67
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QLineEdit shows leftovers of edit cursor after clear() doc: Added indication of default modality value for panels. doc: Added QScopedArrayPointer and corrected QScopedPointer snippet. Improve test coverage of QScriptString::toArrayIndex() QColorDialog::open() freezes the app the *second* time it is used on Mac doc: Corrected typo. doc: Removed bad grammar. doc: Added \obsolete. doc: Added \since 4.6 to the properties. doc: Removed some erroneous text.
| * doc: Added QScopedArrayPointer and corrected QScopedPointer snippet.Martin Smith2010-02-231-0/+55
| | | | | | | | Task: QTBUG-7766
| * doc: Corrected typo.Martin Smith2010-02-231-2/+2
| | | | | | | | Task: QTBUG-8450
| * doc: Added \obsolete.Martin Smith2010-02-232-7/+10
| | | | | | | | Task: QTBUG-8083
* | Always define Q_WS_S60 on Symbian unless configured with -no-s60.Jason Barron2010-02-231-1/+1
| | | | | | | | | | | | | | | | | | Previously we were relying on the toolchain to define the S60 version for us and were enabling Q_WS_S60 based on this. Since the S60 macros are no longer defined for us, let's assume we always want S60 support unless Qt is configured with -no-s60. Reviewed-by: axis
* | Enable window size caching on Symbian NGA variants.Jason Barron2010-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | Enabling this flag saves us the round-trip to WSERV whenever RWindow::Size() is called because the size is cached on the client side. This can improve performance because functions like eglSwapBuffers() call Size() to see if the window size has changed and without the cache this introduces an extra IPC call for every frame. Task-number: QT-2849 Reviewed-by: Iain
* | Use the SYMBIAN_BUILD_GCE macro to check if the GCE variant can be usedJason Barron2010-02-231-1/+1
|/ | | | | | | The correct macro for determing when we can enable the NGA specific functions in Symbian is SYMBIAN_BUILD_GCE. Reviewed-by: Iain
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-221-3/+2
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: amend the doc, as suggested by rittk
| * amend the doc, as suggested by rittkOswald Buddenhagen2010-02-221-3/+2
| | | | | | | | Task-number: QTBUG-8070
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-191-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (22 commits) use egl properties when creating surfaces on symbian work around the current include file structure on Symbian^3 Get rid of the dependency on the Symbian app layer Fix incorrect license headers Fix incorrect license headers Supressed Icon sizes on QPushButton in QS60Style Fixed libstdcpp.dll version autodetection for Symbian Fixed linkage failure when building qmake on Unix platforms Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake ColorDialog is always shown as stripped-down version (for QVGA) Virtual keyboard can't be closed anymore after tapping the text area Revert "Factored readRegistryKey implementation out of qmake" Revert "Factored epocRoot implementation out of qmake" Pass QAudioDeviceInfo when creating audio input/output in examples Symbian backend for QtMultimedia audio Modified configure to detect SDK support for Symbian audio backend Added implementation of epocRoot() function to configure Removed duplicated implementation of readRegistryKeys from configure Factored epocRoot implementation out of qmake ...
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-191-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pass QAudioDeviceInfo when creating audio input/output in examples Symbian backend for QtMultimedia audio Modified configure to detect SDK support for Symbian audio backend Added implementation of epocRoot() function to configure Removed duplicated implementation of readRegistryKeys from configure Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake QWebView scrolling doesn't clear old elements before painting again
| | * | Added implementation of epocRoot() function to configureGareth Stockwell2010-02-181-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | Exposing epocRoot() to the configure application allows it to determine the location of the currently active Symbian SDK, so that support for optional SDK features can be checked. Reviewed-by: Miikka Heikkinen
* | | Ensure that posted events are sent on WindowsBradley T. Hughes2010-02-191-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f21d183 introduced a GetMessage hook that would try to post a message to the Windows queue if the hook received an event that was not the WM_QT_SENDPOSTEDEVENTS message. However, the logic used is flawed, and would never post the message unless we received a message for a window that was not the event dispatcher's internal window. Timer messages DO go to the internal window, and the last handled timer message SHOULD trigger the hook to post a new WM_QT_SENDPOSTEDEVENTS, but due to the flawed logic, it would not. The most notable side effect of this bug is that regular repaints and animations would not become visible unless the user moved the mouse or used the keyboard. Task-number: QTBUG-7728 Reviewed-by: Andreas Aardal Hanssen Fix verified by 2 users in the Jira report mentioned above.
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-182-11/+7
|\ \ | |/ |/| | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Always set channel.reply to 0 when done Revert "Added note to make QList destructor virtual in version 5" Fix s390(x) atomic ops related crashes Fix undefined sequence point compiler warning
| * Revert "Added note to make QList destructor virtual in version 5"Zeno Albisser2010-02-181-1/+1
| | | | | | | | | | | | | | Virtual functions should not be used with copyable types due to slicing. This reverts commit c1db6c2c5a3bbe96a628207af169a032d535426f.
| * Fix s390(x) atomic ops related crashesDirk Mueller2010-02-171-10/+6
| | | | | | | | | | | | | | | | | | | | The s390 implementation of the pointer related atomic ops never worked before, and the memory barrier was mixed up between the Acquire and the Relaxed variant. This fixes both. Merge-request: 2312 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Use correct include path for qglobal.hIain2010-02-181-1/+1
|/ | | | Reviewed-by: Shane Kearns
* Fix compilation on Mac 32-bit.Thiago Macieira2010-02-171-1/+1
| | | | Reviewed-By: Trust Me
* Added note to make QList destructor virtual in version 5Zeno Albisser2010-02-171-1/+1
| | | | Reviewed-by: TrustMe
* Change all ptrdiff_t to qptrdiff.Thiago Macieira2010-02-179-23/+22
| | | | Reviewed-By: Bradley T. Hughes
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-162-11/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits) QLocalSocket::isValid on Windows must check for broken connection fix pipe handle leak in qlocalsocket_win.cpp GraphicsViewBenchmark: Run app in full screen mode on small desktops. Fix Thai text on Windows 7 Fix License headers. QTextCodec::codecForName. Insert in the cache in all cases. Prevented calling the pixmap filter implementations with null pixmaps. Make it possible to run benchmarks with the "-graphicssystem" switch. Add support for running the GraphicsViewBenchmark application manually. Bump version to 4.6.3. Fixed a GLX warning that occured with some Intel chipsets under X11. Fixed compile for maemo6. Cleanup QEglContext & EGLDisplays Moved 'hasAlpha' property from GL2 engine to GL paint device. Remove useless qDebug in QTextCodec autotest QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded Add caching to QTextCodec::codecForName and QTextCodec::codecForMib Add benchmark for QTextCodec Fix several bugs with GL texture cache Compile fix for OpenGL ES. ...
| * QTextCodec::codecForName. Insert in the cache in all cases.Olivier Goffart2010-02-151-1/+3
| | | | | | | | Reviewed-by: Gabriel
| * Bump version to 4.6.3.Jason McDonald2010-02-151-2/+2
| |
| * QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec ↵Olivier Goffart2010-02-121-5/+6
| | | | | | | | | | | | cannot be loaded Reviewed-by: Denis
| * Add caching to QTextCodec::codecForName and QTextCodec::codecForMibOlivier Goffart2010-02-121-4/+35
| | | | | | | | | | | | | | | | | | Theses function are relatively slow, and often called with the same arguments Task-number: QTBUG-7888 Reviewed-by: Thierry Reviewed-by: Andreas
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-166-19/+56
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (201 commits) Fix an issue with the error signal in a callWithCallback not being Add skeleton changes file for 4.6.3. Fixed compiler warning about making the same class a friend twice New test cases for the QScriptString. Fix a deadlock in kqueue implementation of QFileSystemWatcher Don't crash when QTouchEvent is accepted but not handled by a QNAM HTTP: Unify socket EOF handling a bit doc: Added \section1 about serializing operators for Qt collections. Update the composition demo at 60 FPS instead of at painting rate Replace the inline blend function by #define Fix for using QContiguousCache with default constructor or capacity=0 Correctly mark QGraphicsScene::drawItems() as obsolete Compile fix on Mac with 10.5 sdk. QTestLib: don't crash if data tag requested, none available Implement the blend functions with SSE2 doc: Added some since version information. Ignore touch and gesture events when excluding input events Implemented GraphicsView Panel support for gestures. doc: Fixed several typos. Add MSVC-specific expected failures for JS test suite ...
| * | Fixed compiler warning about making the same class a friend twiceZeno Albisser2010-02-161-0/+2
| | | | | | | | | | | | Reviewed-by: Thiago Macieira
| * | Fix a deadlock in kqueue implementation of QFileSystemWatcherBradley T. Hughes2010-02-161-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding and removing lots of files, the kqueue implementation's pipe between the worker thread and the main interface would fill up, causing the thread adding/removing files to block even though the worker thread was no longer running. The kqueue interface gives us information about how much data is available on the pipe (the data member of the kevent struct), so we should use this to make sure we always empty the pipe. We then iterate over all the command bytes and make sure we interpret them correctly. Reviewed-by: Prasanth Ullattil
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-161-14/+21
| |\ \
| | * | Fix for using QContiguousCache with default constructor or capacity=0Zeno Albisser2010-02-151-14/+21
| | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | | doc: Added \section1 about serializing operators for Qt collections.Martin Smith2010-02-161-0/+7
| |/ / | | | | | | | | | Task: QTBUG-8070
| * | Ignore touch and gesture events when excluding input eventsDenis Dzyubenko2010-02-121-0/+11
| | | | | | | | | | | | | | | | | | | | | When asked to exclude input events when processing events in the event dispatcher we should also exclude touch and gesture events on Windows and Mac. Reviewed-by: Bradley T. Hughes
| * | doc: Fixed several typos.Martin Smith2010-02-121-1/+1
| |/ | | | | | | Task: QTBUG-7997
* | Partial upgrade packages for QtCore and QtGuiShane Kearns2010-02-161-0/+16
|/ | | | | | | | | | | | When debugging or benchmarking changes in QtCore / QtGui, it is inconvenient to reinstall the whole of Qt. This allows 'make sis' to generate a partial upgrade sis files, which can be installed on top of an existing Qt installation. This relies on binary compatibility, so you should be using def files. Self-signed partial upgrade can only install on top of self-signed Qt. Reviewed-by: Miikka Heikkinen
* doc: Fixed several typos.Martin Smith2010-02-121-3/+3
| | | | Task: QTBUG-7997
* We need to export qBadAlloc() on all platformsHarald Fernengel2010-02-112-5/+0
| | | | | | | | This supports the (documented) case when mixing Qt built without exception support with code that was built against Qt with exception support. Reviewed-by: Robert Griebl
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-101-1/+1
|\ | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the WebKit build Blinking cursors are 2 pixels wide on Mac OS X/Cocoa. Fixed compilation with QT_NO_WHEELEVENT Take into account the solaris-cc-64-stlport mkspec Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ffae5e11181a3961193fa21ea405851cad714d4b )
| * Take into account the solaris-cc-64-stlport mkspecPierre Rossi2010-02-101-1/+1
| | | | | | | | Reviewed-by: Simon Hausmann
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-082-9/+39
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make generate uid3 (symbian) work on 64 bit host platform. Updated the docs for QPainter::begin/endNativePainting() Compile fix for network benchmarks. Add a pixmap modification hook to blur pixmap filter cache Delete benchmark examples (qtestlib-simple and qtwidgets). Restructure tests/benchmarks directory. Fixed QImagReader::setAutoDetectImageFormat() to work with plugins. QLineEdit: regression: read-only line edits would eat shortcuts. QGraphicsItem: Do not crash at exit if there is static QGraphicsItem. Make QTextCodec reentrant.
| * Make QTextCodec reentrant.Olivier Goffart2010-02-082-9/+39
| | | | | | | | | | | | | | QTextCodec::codecForName and codedForMib were not reentrant Reviewed-by: Brad Reviewed-by: Denis
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-061-2/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
| * A fix for accidently reused variable names in nested iterations.Zeno Albisser2010-02-051-2/+2
| | | | | | | | Reviewed-by: Peter Hartmann
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-051-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (49 commits) Fixed qt_x11_wait_for_window_manager Revert change 34f1758 on non-Synbian platforms Fixed QGifHandler::loopCount(). Fix tst_QAccessiblity failure. fix compile error when linuxinput keyboard driver is compiled as plugin Fixed the context menu test case in the qgraphicsscene autotest. fix regression from Qt 4.5 wrt missing text pixels in QTabBar Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown" Cleanup after "QGraphicsWidget is painted twice on the first show" Changed qgraphicswidget autotest to use qWaitForWindowShown. Improved QTest::qWaitForWindowShown on X11. Stabilize tst_QGraphicsWidget::initialShow2 (new test) Make sure we define S_IFDIR on Windows Fix copy/pasto Crash when closing any top-level widget on Symbian. Cache the sizes of the images in an animated GIF. Fix the QAbstractSlider autotest. Use OpenVG scissor on 90/180/270 rotations and simple clips. Optimize single-rect IntersectClip in OpenVG using the scissor QGraphicsWidget is painted twice on the first show. ...
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-051-0/+3
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits) Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown" Cleanup after "QGraphicsWidget is painted twice on the first show" Changed qgraphicswidget autotest to use qWaitForWindowShown. Improved QTest::qWaitForWindowShown on X11. Stabilize tst_QGraphicsWidget::initialShow2 (new test) Make sure we define S_IFDIR on Windows Fix copy/pasto Crash when closing any top-level widget on Symbian. Cache the sizes of the images in an animated GIF. Fix the QAbstractSlider autotest. Use OpenVG scissor on 90/180/270 rotations and simple clips. Optimize single-rect IntersectClip in OpenVG using the scissor QGraphicsWidget is painted twice on the first show. Compiler warning in QAbstractSlider. Optimize QPathClipper::pathToRect. QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible. QStyleSheetStyle: Fix combinaison of border-image and border-radius Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal scrollbar" Proper Fav icon is not shown, for all the links default fav icon shown Update changes-4.6.2. ...
| | * Merge remote branch 'staging/4.6' into 4.6Samuel Rødal2010-02-041-0/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Manual resolve of conflict in changes-4.6.2 in staging-2. Conflicts: dist/changes-4.6.2