summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated version references in autotestsEckhart Koppen2011-05-139-9/+9
| | | | Tests now refer to version 5.0.0
* Updated default Qt version to 5.0.0Eckhart Koppen2011-05-132-2/+2
| | | | | Changed default version in qbase.pri and qpluginbase.pri in case no version is given at all.
* Removed deprecated functions in QListEckhart Koppen2011-05-131-91/+0
| | | | | Removed detach, detach2, detach3 and append which were marked as required only up to 4.5.x
* Updated Qt and QtBase module version number to 5.0.0Eckhart Koppen2011-05-1312-35/+35
| | | | Updated version in qglobal.h as well as the module version itself
* Updated data stream version for Qt 4.9 and 5.0Eckhart Koppen2011-05-131-3/+4
| | | | | For now, using the same version as 4.8. This needs to be corrected when the actual data stream version is known.
* Fix deadlocks in wayland clipboard that can occur in special scenarios.Laszlo Agocs2011-05-132-10/+24
| | | | | | | | | | | | setMimeData() emits the changed signal always so to prevent duplicated signals keyboardFocus() must only emit when the change came from another wayland client. However direct connection may cause issues when invoking the slot from a wayland callback, so use a metacall to make sure we return from the callback. Unnecessary data transfer and potential deadlock is now also avoided when a client is requesting the mime data from itself. Reviewed-by: Jørgen Lind
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingJason McDonald2011-05-1333-1633/+1806
|\
| * tests: add bug numbers to a few FIXMEsRohan McGovern2011-05-133-4/+3
| | | | | | | | Change-Id: Idd01ce127859516dbab10644b97b281cb5218720
| * Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefileRohan McGovern2011-05-136-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | Recursive QMAKE_EXTRA_TARGETS were omitting the `-f' option to make. This would break in the case where the correct makefile was not named `Makefile'. The included autotest demonstrates the problem. Note that this was fixed for normal targets back in 2005 by faac7bd178654fd67a6f3f9cf4f6f2605071448d (p4 202370), but was not fixed for extra targets. Reviewed-by: ossi (cherry picked from commit 96a3bf7a8bbc1e5361e16cbeeceb4be674b88c30)
| * fix compilation with namespacesLars Knoll2011-05-121-8/+8
| | | | | | | | | | Reviewed-by: Bjørn Erik Nilsen (cherry picked from commit 7a1c29f101b95c9cc2cb53f8b80d231b5a994a9a)
| * Fix compilation with namespaces enabledLars Knoll2011-05-122-0/+14
| | | | | | | | | | Reviewed-by: Samuel Rødal (cherry picked from commit bff68fc7094a50af57f7da23ecf9b25cab00f188)
| * Make QLineControl send accessibility updates.Frederik Gladhorn2011-05-125-5/+13
| | | | | | | | | | | | | | | | | | | | To make it emit the signals for the right object, it needs its parent to be the QGraphicsItem/SGItem/QLineEdit. According to IA2 it should emit TextUpdated and CursorMoved signals. TextChanged is deprecated. More fine grained signals would be desireable but this makes changes work at all. Reviewed-by: Morten Sorvig
| * Revert "Fix double painting when adding an item into a linear layout"Jan-Arve Sæther2011-05-122-45/+1
| | | | | | | | | | | | | | | | | | | | | | | | (It did not really fix the issue.) This reverts commit 33f525e636ef8fa64a15d3e66c56adaea0075bda. Conflicts: src/gui/graphicsview/qgraphicslinearlayout.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp (cherry picked from commit fee052e3e37b3335fe563cb8a1881bf59f9e25d0)
| * Fix licence headers again for MR 900Sergio Ahumada2011-05-123-12/+19
| | | | | | | | | | | | | | See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2 Reviewed-by: Gabriel de Dietrich (cherry picked from commit bc16ebdb7aeff70fe8149297183636ea7fd14ed1)
| * Improve invalidate() testcase.Jan-Arve Sæther2011-05-121-59/+276
| | | | | | | | | | | | | | | | Test number of: * events * setGeometry() calls * invalidate() calls (cherry picked from commit b8b4e6fe141d99c4639d492a546226cdc3fc06c5)
| * Avoid flicker when invalidate is propagated in a widget/layout hierarchyJan-Arve Sæther2011-05-128-76/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not call invalidate from activateRecursive(). This resulted in that a layout was invalidated as many times as there were items in the layout. * Several improvements. Do not call resize(size()) too often. Calling resize() from the widgetEvent() is not very nice though... * Remove commented out code * make sure layout is activated even if the widget does not change size * activate the layout if the resize is same as size() * In order to not break existing apps, make this an opt-in feature with QGraphicsLayout::setInstantInvalidatePropagation(true); Reviewed-by: Frederik Gladhorn Reviewed-by: John Tapsell
| * Fix licence headers again for MR 900Gabriel de Dietrich2011-05-123-34/+40
| | | | | | | | | | | | | | See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2 Reviewed-by: Trust me (cherry picked from commit 7b6a7f475119878681c9d0c06b29896ec3fe72c3)
| * New algorithm for drawing thin linesLars Knoll2011-05-126-1449/+1137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new QCosmeticStroker class for drawing thin lines. The class can handle both aliased and antialiased lines. The code replaces all the midpoint line drawing algorithms in the raster paintengine and gives correct subpixel positioning for lines. It gives around 30% to 50% speedup against the midpoint algorithm. If we missed that fast path, the speedup is around between a factor of 6 to 8 for lines and aliased paths and 100 and 400 for antialiased paths. Reviewed-by: Kim (cherry picked from commit 37c329a3e35fabc88fbcad824a69f37c671d2132)
* | Make error checking in QSignalSpy consistentJason McDonald2011-05-132-3/+14
|/ | | | | | | | | | | | | QSignalSpy's constructor failed gracefully for some problems with the parameters, but not for null parameters, for which there was only a Q_ASSERT. This commit makes the handling of null parameters consistent with the handling of other errors -- output a meaningful error message with qWarning() and return, so that isValid() will subsequently return false. Change-Id: I7f5677a4c10185e30403ce3e12a022de8c13bc1c Task-number: QTBUG-14283 Reviewed-by: Rohan McGovern
* Prevent crash in OpenGL engine when scaling images / pixmaps.Samuel Rødal2011-05-114-0/+20
| | | | | | | | | Make sure the resulting image / pixmap is valid if the source was valid. Task-number: QTBUG-19157 Reviewed-by: Kim Reviewed-by: Benjamin Poulain (cherry picked from commit 1c5da7207a21cc44a4a08d291c290ffcd9b958fd)
* Add the QIdentityProxyModel.Stephen Kelly2011-05-119-1/+1103
| | | | | | | | | | | | | | | | | Older commit history is in KDE svn: http://websvn.kde.org/trunk/KDE/kdelibs/kdeui/itemviews/kidentityproxymodel.cpp?view=log Ammended to update the license headers. Merge-request: 900 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> Conflicts: doc/src/frameworks-technologies/model-view-programming.qdoc tests/auto/headers/tst_headers.cpp (cherry picked from b00089261eafbdf5f92ed94d7fb20b402bfcaeb2)
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-1225-86/+786
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: update def files emit QNetWorkAccessManager::finished on QNetworkReply::abort() Don't run XLib check if -no-gui is used don't ignore create_prl for static plugins make QLibraryInfo return clean paths make relative paths in qt.conf work inside qmake Sockets: Fix potential null pointer usages QNAM: Re-order checks in migrateBackend() Fix initial main window dimensions for "fullscreen with softkeys" case Fix spelling mistake Fixes crash in QWidget::effectiveWinId. Fix crash when QSocketNotifier used with an invalid descriptor Optimisation - buffer packet read in pendingDatagramSize Remove warnings when disabling notifications on a closed socket Fix some warnings in symbian network tests
| * update def filesShane Kearns2011-05-116-51/+526
| | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 84cf56543c3e9add4f06ed65cf419561117ee739)
| * emit QNetWorkAccessManager::finished on QNetworkReply::abort()Martin Petersson2011-05-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | If we can not get online when the request is made then we are in the WaitingForSession state. This will happen for example if the device is in flight mode. This fix follows the same logic as in _q_networkSessionFailed, but we should look into why we have the WaitingForSession check in finished(). Task-number: QT-4747 Reviewed-by: Markus Goetz (cherry picked from commit 0c9cb9a34d6b472cb53bf1af4616af55b593b616)
| * Don't run XLib check if -no-gui is usedBernhard Rosenkraenzer2011-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Currently, an attempt to compile Qt even with -no-gui on a Linux box that doesn't have libX11 installed fails becaue of the XLib functionality check in configure. This check can be turned off in -no-gui mode, since QtCore, QtXml, QtNetwork and friends don't use libX11. Merge-request: 1214 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 912b6804bcacbf1b4f356d947986df8156a545a4)
| * don't ignore create_prl for static pluginsOswald Buddenhagen2011-05-111-1/+1
| | | | | | | | | | | | Task-number: QTBUG-18436 Reviewed-by: joerg (cherry picked from commit 2ca4ce848c63c9fa0a48c0f9f4e7fdbc90463bf1)
| * make QLibraryInfo return clean pathsOswald Buddenhagen2011-05-111-4/+6
| | | | | | | | | | | | | | | | | | as a side effect, don't use QDir for path resolution - it doesn't buy us anything. Task-number: QTBUG-1371 Reviewed-by: joerg (cherry picked from commit 9cd62e4f7b23894a672297f6eebda64cdbd53cb0)
| * make relative paths in qt.conf work inside qmakeOswald Buddenhagen2011-05-111-1/+1
| | | | | | | | | | | | Task-number: QTBUG-11602 Reviewed-by: joerg (cherry picked from commit e6bb6ba76942d98e4b50a7fd32bf44e211f2fa5e)
| * Sockets: Fix potential null pointer usagesShane Kearns2011-05-112-8/+13
| | | | | | | | | | | | | | | | | | QAbstractSocketEngine::createSocketEngine can return 0 as well as throw. In two cases the pointer was being used before the null check, in a 3rd case the null check was missing. Reviewed-by: Markus Goetz (cherry picked from commit 19edac88af53eea7f733cabbaee77f9b725b7ea9)
| * QNAM: Re-order checks in migrateBackend()Markus Goetz2011-05-111-4/+4
| | | | | | | | | | | | | | | | | | Do the easy checks first, will avoid a crash in the HTTP code if request is serviced from the cache. Task-number: QTBUG-18770 Reviewed-by: Peter Hartmann (cherry picked from commit d03a28a289cf0665290e6ea0375b31cbb2d6649e)
| * Fix initial main window dimensions for "fullscreen with softkeys" caseMiikka Heikkinen2011-05-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | The application main window defaults to fullscreen size when initially constructed, even if softkeys are specified for it, as the screen furniture is constructed later in show_sys. This resulted in the main window being partially under softkeys. Fixed by invoking handleClientAreaChange() explicitly in show_sys in fullscreen with softkeys case. Task-number: QTBUG-19043 Reviewed-by: Sami Merila (cherry picked from commit e8fc93973a41f193665baa5fdc26cba951bd692f)
| * Fix spelling mistakeShane Kearns2011-05-111-1/+1
| | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit b166c30d8d0834518337ded44d2ebfe097ee312f)
| * Fixes crash in QWidget::effectiveWinId.Bjørn Erik Nilsen2011-05-113-0/+46
| | | | | | | | | | | | | | | | | | | | | | Widgets are left in a transitional (and incosistent) state while being re-parented, which caused QWidget::effectiveWinId() to crash in certain circumstances. See patch for more details. Auto test included. Reviewed-by: ogoffart (cherry picked from commit 6db0153cd7e35e4a919a76ae2aadbf2d2510bfb7)
| * Fix crash when QSocketNotifier used with an invalid descriptorShane Kearns2011-05-113-1/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | select code for open C file/socket descriptors was crashing in FD_SET if a QSocketNotifier was created with an invalid descriptor. Added two autotests to QSocketNotifier, one to check notifiers with bogus socket descriptors don't crash, the other to check that notifiers with posix socket descriptors do work. (symbian socket engine doesn't use them so they are not implicitly tested) Reviewed-by: mread Task-Number: QTBUG-18138 (cherry picked from commit 8a9a6afcf02f089f932bc81431ab46a60af32134)
| * Optimisation - buffer packet read in pendingDatagramSizeShane Kearns2011-05-112-9/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian, the OS function to get the size of a pending datagram also includes the size of the packet header (which is different for IPv4 and IPv6). We were reading the datagram with the "peek" flag set to implement pendingDatagramSize, then reading again normally when the client called read/readDatagram. This change removes the "peek" flag, and buffers the datagram in the socket engine, returning it and clearing the buffer when read or readDatagram is called. If there is no buffered data, the existing code path is followed - it isn't mandatory to call pendingDatagramSize before reading from the socket. Reviewed-by: Markus Goetz (cherry picked from commit dd8de4c2437397748daba49569cbc7f89a8bfbee)
| * Remove warnings when disabling notifications on a closed socketShane Kearns2011-05-111-6/+1
| | | | | | | | | | | | | | | | | | | | | | The generic layer calls setReadNotificationEnabled(false) on sockets after they are closed. This no longer causes a warning from the symbian socket engine. A warning will only be emitted if trying to enable notifications on a closed socket. Task-number: QTBUG-18713 Reviewed-by: Markus Goetz (cherry picked from commit 0aa780235c24ed724fcf6a9095a6467e34b9346e)
| * Fix some warnings in symbian network testsShane Kearns2011-05-114-1/+9
|/ | | | | | | | | | Ignore warning when the test intentionally sets an invalid socket descriptor. Make sure to set content type on all http post tests in tst_qnetworkreply. Run test with enough capabilities to avoid platsec errors when accessing certificate store. Reviewed-By: Markus Goetz (cherry picked from commit 9632fdefa9012ca11cd1345d66bafd6f417de88e)
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-1120-53/+105
|\ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Fix tst_QVariant::invalidColor Move QTextCursor::MoveStyle to Qt namespace Add some QRawFont related low level functions to avoid extra copying
| * Fix tst_QVariant::invalidColorJiang Jiang2011-05-111-1/+0
| | | | | | | | | | | | | | | | Since a423ff5474b89028eeca95b254f5184311c8223b, the warning message is no longer produced. Reviewed-by: Samuel Rødal (cherry picked from commit 8a5e82732be3aac37d14ef85c6974add46c6b65f)
| * Move QTextCursor::MoveStyle to Qt namespaceJiang Jiang2011-05-1117-47/+50
| | | | | | | | | | | | | | | | | | | | We cannot use QTextCursor::MoveStyle enums in QTextLine because QTextCursor is not a QObject, while referring to that enum in Q_PROPERTY requires it to be. That's why we need to move the enums in Qt namespace. Reviewed-by: David Boddie (cherry picked from commit 5eba82b752e85a5d6cb3a893214ed2646d75f362)
| * Add some QRawFont related low level functions to avoid extra copyingJiang Jiang2011-05-112-5/+55
| | | | | | | | | | | | | | | | | | | | | | | | Added functions: - QRawFont::glyphIndexesForChars(const QChar *chars, int numChars, quint32 *glyphIndexes, int *numGlyphs) const - QRawFont::advancesForGlyphIndexes(const quint32 *glyphIndexes, QPointF *advances, int numGlyphs) const Reviewed-by: Eskil (cherry picked from commit 965af9eb2932efae5d736df54c3859460017b6a5)
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-111-1/+1
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Fix GLES2 include path for applications when not using the dash shell
| * Fix GLES2 include path for applications when not using the dash shellPaul Olav Tvete2011-05-111-1/+1
| | | | | | | | | | | | | | Backslash escapes normally requires "-e" option to echo Reviewed-by: Jørgen (cherry picked from commit 68f37a29f911fce5bcdd285b1fc1bc6d4868d78e)
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-111-0/+1
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Fix to commit 7fce0a73cc9b099c4ca67b3bc2e8bbe3060230c6.
| * Fix to commit 7fce0a73cc9b099c4ca67b3bc2e8bbe3060230c6.Kim Motoyoshi Kalland2011-05-111-0/+1
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-112-2/+2
|\ \ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: tests: fixed or disabled qtbase tests with circular dependencies
| * | tests: fixed or disabled qtbase tests with circular dependenciesRohan McGovern2011-05-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | tst_lancelot did QT+=svg, but didn't actually use QtSvg. qlocalsocket/lackey uses QtScript, which is not available when compiling qtbase. Change-Id: Ic3cc5a6f74a58ee8f2fdc48b9c852d9551b85f68
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-111-13/+19
|\ \ \ | | |/ | |/| | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Check if OES_texture_npot is present on OpenGL ES 2.
| * | Check if OES_texture_npot is present on OpenGL ES 2.Kim Motoyoshi Kalland2011-05-111-13/+19
| | | | | | | | | | | | | | | | | | | | | Unless the OES_texture_npot extension is present, non-power- of-two textures have some restrictions on OpenGL ES 2. Reviewed-by: Samuel
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-111-22/+22
|\ \ \ | | |/ | |/| | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: Fix a bug in syncqt.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 17:25:37 +0000