summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix transformIsSimple in QGraphicsSceneJørgen Lind2012-01-311-18/+1
| | | | | | The transformIsSimple was a bit to restrictive Reviewed-by: bnilsen
* Fix reversed condition introduced in 9a6cfc07e5João Abecasis2012-01-311-1/+1
| | | | Reviewed-by: Bradley T. Hughes
* Check elapsed time only onceJoão Abecasis2012-01-311-2/+3
| | | | | Task-number: QTBUG-16262 Reviewed-by: Bradley T. Hughes
* QPrintPreviewDialog displays the second page instead of the first one when ↵Marko Valtanen2012-01-311-1/+1
| | | | | | it is initially shown maximized. Task-number: QTBUG-14517
* Stop using XLFD as fontconfig matching fallbackJiang Jiang2012-01-311-11/+0
| | | | | | | | | | | Following our kill list of moving away from XLFD, and since the result of XLFD is unreliable and problematic (it requires maintainence of fonts.dir/fonts.alias which people no longer care about), remove the usage of XLFD as a fallback for fontconfig matching. Task-number: QTBUG-17455 Reviewed-by: Eskil
* Place cursor at the end of the selected rangeJiang Jiang2012-01-311-1/+1
| | | | | | | | | Selected range is the range of the text that has been edited with input method, but not yet committed, normally the cursor should be placed that the end of it (or hidden). Task-number: QTBUG-17923 Reviewed-by: Morten Sørvig
* QtConcurrent: throw exception from destructorOlivier Goffart2012-01-312-6/+29
| | | | | Task-number: QTBUG-18149 Reviewed-by: Morten Sorvig
* Add test for ISODate change in QDateTime::toStringJens Georg2012-01-311-0/+32
| | | | | Merge-request: 1149 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Update documentation of QDateTime::toStringJens Georg2012-01-311-1/+5
| | | | | Merge-request: 1149 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Fix QDateTime::toString for Qt::ISODateJens Georg2012-01-311-0/+15
| | | | | | | Fixes QTBUG-18290 and the "missing Z" from QTBUG-9698 Merge-request: 1149 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* QNetworkCookie: allow spaces in unquoted valuesPeter Hartmann2012-01-312-4/+13
| | | | | | | | | | We should follow http://tools.ietf.org/html/draft-ietf-httpstate-cookie-23 , which says parse the value until reaching the next ';' or the end of the line. Other cookie implementations allow spaces in unquoted values as well. Reviewed-by: Martin Petersson Task-number: QTBUG-18876
* Fixed bug in QPdfEngine::addImage causing mono images to be made 32 bitMatthew Cattell2012-01-311-1/+4
| | | | | | | Regression from 4.5 causing performance and size degradation. Task-number: QTBUG-18997 Reviewed-by: Samuel
* Fix in-process drag-n-drop of image data, image/* was not available.David Faure2012-01-311-6/+22
| | | | | | | | | | | | If we give the exact initial QMimeData to the dropEvent, we only get application/x-qt-image as available mimeType. We need to go through QDropData to call xdndObtainData, which can still do some in-process optimization, but there we can do the "saving QImage to the requested format" conversion. Task-number: QTBUG-4110 Merge-request: 860 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* make QFileSystemModel::rmdir(dir) remove dir from fileInfoGathererZeno Albisser2012-01-312-3/+9
| | | | | | | | | Otherwise directories cannot be deleted as long as they are watched, since the fileInfoGatherer keeps a QFileInfo object with open file handles. Reviewed-by: Joao Task-number: QTBUG-8241
* QPointer: thread safetyOlivier Goffart2012-01-312-0/+34
| | | | | | | | Fix a race condition between the destructor of QPointer and the destruction of the object living in a different thread. Task-number: QTBUG-16005 Reviewed-by: Joao
* Fixed bug in X11 backend when creating translucent windows.Samuel Rødal2012-01-311-2/+7
| | | | | | | We forgot to send the ParentAboutToChange event, which meant QGLWidget didn't destroy the old EGL surface. This could cause two EGL surfaces to be created for the same QGLWidget, which leads to undefined behaviour on some platforms.
* Fix tst_QVariant::qvariant_cast_QObjectOlivier Goffart2012-01-311-1/+7
| | | | | | | | qvariant_cast_QObject_data was creating the QVariant wrong, The QVariant(int, void*) constructor take a pointer to the value of the type ObjectStar (hence a pointer to a pointer) Task-number: QTBUG-18257
* Fixed a crash on Windows XP with mingw in threaded-codeThierry Bastian2012-01-311-1/+1
| | | | | | | | | The thread callback doesn't align the stack on 16-bytes on WinXP. That causes a crash when we call SSE code. So now we tell the compiler to force that alignment of the stack. Task: QTBUG-18631 Reviewed-By: Olivier
* Fix for QTBUG-18947. Changed the macosx deployment target to 10.5Simo Fält2012-01-311-1/+1
| | | | Reviewed by: Eckhart Köppen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-12-301-0/+2
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging: Doc: Add `-xunitxml' option to qtestlib documentation
| * Doc: Add `-xunitxml' option to qtestlib documentationSergio Ahumada2011-12-301-0/+2
|/ | | | | Task-number: QTBUG-14305 Reviewed-by: Casper van Donderen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-12-161-1/+1
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash in positionInLigature
| * Fix crash in positionInLigatureJiang Jiang2011-12-161-1/+1
| | | | | | | | | | | | | | Check boundary of pos before accessing attributes. Task-number: QTBUG-23104 Reviewed-by: Eskil
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-12-072-0/+50
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny
| * | Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAnySami Rosendahl2011-12-072-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several crash backtraces point to crash in QHttpNetworkReply::readAny, where d->connection==0. This patch adds a check for d->connection to QNetworkAccessHttpBackend. If the connection is found to be destroyed, the request is finished. Does not need to be merged to 4.8 because the internals have changed (Peter Hartmann) PMO 290352 Merge-request: 1491 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-11-303-40/+352
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix HarfBuzz Thai character SARA AM handling
| * | Fix HarfBuzz Thai character SARA AM handlingJiang Jiang2011-11-303-40/+352
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is contributed by Thanomsub Noppaburana from libthai. It added a special thai shaping function to handle SARA AM character for fonts without OpenType rules to support it, like Nokia Pure Text AS. With modification to logClusters assignment to make sure that QTextLine::glyphRuns(int from, int length) returns correct glyphs. Task-number: QTBUG-21206 Change-Id: I5a78ee1ab2b4c874c7d0df17d4ee6d264ed5a790 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-11-301-14/+26
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Reduce unnecessary QtCore DLL loads during Symbian app thread creation
| * Reduce unnecessary QtCore DLL loads during Symbian app thread creationmread2011-11-301-14/+26
|/ | | | | | | | | | | | | | The Symbain fast allocator integration in Qt 4.7 loads QtCore.DLL to check availablility. This load has been causing a crash in the Nokia Store app when a different version of QtCore 4.7 is installed. The new DLL is loaded and it's static data tries to initialise before the allocator is set up. This change stores the allocator setup function so that extra DLL loads are not required. Now the same allocator setup function is used for the lifetime of the app. Reviewed-by: Shane Kearns
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-11-151-0/+4
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging: tests: allow unstable tests to be marked with CONFIG+=insignificant_test
| * tests: allow unstable tests to be marked with CONFIG+=insignificant_testRohan McGovern2011-11-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Reviewed-by: Jason McDonald Change-Id: I50a712c33c2ebb0af39f1ea0bf2adef7f0936425 (cherry picked from commit b0a5a988900b777cb08012408eb108512a3e873b)
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-11-151-1/+4
|\ \ | |/ |/| | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix focusScopeItemChange setting crash
| * Fix focusScopeItemChange setting crashDamian Jansen2011-11-151-1/+4
| | | | | | | | | | | | | | | | Delay focusScopeItemChange to after reparenting, to prevent an invalid focusScopeItem pointer crash. Task-number: QTBUG-21640 Reviewed-by: Martin Jones
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-112-2/+27
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
| * | Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEndSami Rosendahl2011-11-112-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a HTTP server responds with gzip-encoded empty content without defining Content-Length in the response header QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd will crash because it calls zlib inflateEnd for an uninitialized stream. - Fixed the crash by adding a check if the stream is initialized to gunzipBodyPartiallyEnd. - Added a regression test tst_QNetworkReply::nb279420gzipNoContentLengthEmptyContentDisconnect PMO 279420 Task-number: QTBUG-22660 Signed-off-by: Sami Rosendahl <sami.rosendahl@reaktor.fi> Merge-request: 1465 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-11-095-8/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: symbian - handle path being passed as part of filename in QTranslator Symbian - fix compile error when default configured
| * | | symbian - handle path being passed as part of filename in QTranslatorShane Kearns2011-11-074-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Although incorrect API usage, this was a regression from 4.7.3 behaviour Task-number: QTBUG-22489 Reviewed-by: mread
| * | | Symbian - fix compile error when default configuredShane Kearns2011-11-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New code assumed building with OpenGL/OpenVG, which is the production configuration, but not the default configuration Reviewed-By: Jani Hautakangas Task-Number: QTBUG-21996
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-082-0/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Compile when -no-rtti is specified as a configure option Ensure that the RC_FILE is correctly handled in a single configuration
| * | | Compile when -no-rtti is specified as a configure optionAndy Shaw2011-11-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussing with Marko who did the original backport of the ShaderEffect to Qt 4.7 it was agreed that this is the correct thing to do in this case. Merge-request: 2713 Task-number: QTBUG-22419 Reviewed-by: Marko Niemelä
| * | | Ensure that the RC_FILE is correctly handled in a single configurationAndy Shaw2011-11-071-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With MSVC 2010 if a single configuration vcxproj file was created then it would not have an entry for the .rc file only the .res file that would be compiled from it. Without the entry for the .rc file then it would not compile the .res file. Task-number: QTBUG-22545 Merge-request: 1452 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-10-281-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbian - disable memory mapping in QNetworkDiskCache
| * | Symbian - disable memory mapping in QNetworkDiskCacheShane Kearns2011-10-281-1/+1
| |/ | | | | | | | | | | | | | | | | | | The implementation of memory mapped files in Open C requires munmap to be called from the same thread as mmap. As the QIODevice can be handed off to another thread, this breaks application code that works on other operating systems. Task-number: QT-5309 Reviewed-by: Tadaaki Matsumoto
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-10-279-59/+127
|\ \ | |/ |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fix security problem on webpage due to bad JS Accepting predicted text using hardware keyboard replaces unwanted part Doc: adding link to the Qt Quick Components for Symbian page.
| * Merge remote-tracking branch 'upstream/4.7' into 4.7Sergio Ahumada2011-10-274-2/+27
| |\ | |/ |/| | | | | Conflicts: src/gui/inputmethod/qcoefepinputcontext_s60.cpp
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-272-0/+25
|\ \ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Adding items to a view with no delegate crashes.
| * | Adding items to a view with no delegate crashes.Martin Jones2011-10-272-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | If there is no delegate then clear state and return. Change-Id: I786b9bc4018706797056fbd1ad25d25663102707 Task-number: QTBUG-22379 Reviewed-by: Andrew den Exter
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-10-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging: Doc: Fix example code
| * | | Doc: Fix example codeSergio Ahumada2011-10-211-1/+1
|/ / / | | | | | | | | | Task-number: QTWEBSITE-281
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-10-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
generated by cgit v0.12 at 2025-09-23 12:55:42 (GMT)