summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into refactorLars Knoll2011-05-1255-1596/+2628
|\ | | | | | | | | | | | | | | Conflicts: src/gui/gui.pro src/gui/painting/painting.pri src/opengl/opengl.pro src/openvg/openvg.pro
| * 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)
| * Prevent crash in OpenGL engine when scaling images / pixmaps.Samuel Rødal2011-05-112-0/+4
| | | | | | | | | | | | | | | | | | 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-115-1/+701
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * 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)
| * 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)
| * Fixes crash in QWidget::effectiveWinId.Bjørn Erik Nilsen2011-05-112-0/+21
| | | | | | | | | | | | | | | | | | | | | | 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-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-1116-47/+100
| |\ | | | | | | | | | | | | | | | | | | * '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
| | * Move QTextCursor::MoveStyle to Qt namespaceJiang Jiang2011-05-1114-42/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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-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-stagingQt Continuous Integration System2011-05-111-0/+2
| |\| | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Prevent crash in wayland mimedata in case there is no offer.
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-119-0/+22
| |\ \ | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: Add QT_xxx_VERSION macros for each library in qtbase
| | * | Add QT_xxx_VERSION macros for each library in qtbaseLiang Qi2011-05-109-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide version info for each library like QTCORE_VERSION and etc. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* | | | move files in src/gui into their final locationsLars Knoll2011-05-1182-101/+100
| | | | | | | | | | | | | | | | | | | | Rename the guikernel subdir to kernel and guiutil to util.
* | | | Deliver leave event to proper widget (not the top-level).Samuel Rødal2011-05-111-1/+2
| | | |
* | | | Improved popup and mouse event handling.Samuel Rødal2011-05-113-26/+117
| | | | | | | | | | | | | | | | | | | | Use QApplicationPrivate::sendMouseEvent() to ensure hover events are sent. Copy most of the popup handling code from qapplication_x11.cpp
* | | | Compile fixes after merge.Samuel Rødal2011-05-112-4/+4
| | | |
* | | | Merge remote branch 'staging/master' into refactorSamuel Rødal2011-05-11172-2640/+5418
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qdrawhelper_p.h src/gui/painting/qgraphicssystemfactory.cpp src/gui/painting/qpainter.cpp src/gui/painting/qunifiedtoolbarsurface_mac.cpp src/gui/painting/qunifiedtoolbarsurface_mac_p.h src/openvg/openvg.pro src/openvg/qpaintengine_vg.cpp src/openvg/qwindowsurface_vg.cpp src/openvg/qwindowsurface_vgegl.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/widgets/graphicsview/qgraphicsscene.cpp
| * | | Prevent crash in wayland mimedata in case there is no offer.Laszlo Agocs2011-05-101-0/+2
| |/ /
| * | Prevent having Status undefined in xlib platform plug-in.Laszlo Agocs2011-05-101-0/+3
| | | | | | | | | | | | | | | | | | Commit 4b75ceea08815c096ec35a077c5c1e3bfca0e5ed changed qcoreapplication_p.h to include qsettings.h, which undefines Status. This breaks the xlib platform plug-in (and its includes).
| * | Merge remote-tracking branch 'staging/master'Olivier Goffart2011-05-105-22/+262
| |\ \
| | * | Compile on MacEskil Abrahamsen Blomfeldt2011-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing API update in Q_WS_MAC block Reviewed-by: Jiang Jiang (cherry picked from commit 4b95d9939db75d7bd55db4bbbf2d67af459f7eb5)
| | * | Avoided calling updateAccessibility() from updateMicroFocus if the item was ↵Jan-Arve Sæther2011-05-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hidden This had the following negative effect in qmlviewer: - Every time the qmlviewer logged something to its QPlainTextEdit (regardless of if it was visible or not) it would call updateMicroFocus (because appending to QPlainTextEdit would move the cursor). The result was that the AT client got overloaded with accessibility state changes, and response time got really bad. (cherry picked from commit ad50e45311cce712fbe35641cde973d616ff560d) Reviewed-by: Frederik Gladhorn (cherry picked from commit a825b3a9e6132842090e43fae85d2c6c61b2def6)
| | * | Notify a11y framework of FocusChanges for QGraphicsObjectJan-Arve Sæther2011-05-101-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 1b5cb7865eb8b48a2721f9b9c3ccd2fb25f8175d) Reviewed-by: Frederik Gladhorn (cherry picked from commit 9a02ad74693f1835745ec20798b353f7e62bcd5e)
| | * | Call updateAccessibility on the QGraphicsObject in updateMicroFocusJan-Arve Sæther2011-05-101-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QGraphicsObjects now can be in the a11y hierarchy, we should treat them just like we treat widgets. (cherry picked from commit 860745a4713b29857d14571572504da71a2ca077) Reviewed-by: Frederik Gladhorn (cherry picked from commit 4687938fd03ed65306039af6b4e5e192ec8bf491)
| | * | Fix updateAccessibility for QGraphicsObjectsJan-Arve Sæther2011-05-101-1/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If updateAccessibility is called on a QGraphicsObject, walk up and find the closest ancestor widget with a HWND. (cherry picked from commit d4291591dfb6a7b1f5c7d00879e8162e84d9ab1b) Reviewed-by: Frederik Gladhorn (cherry picked from commit 96406a7dd609e75340f7b4a05726c60c197786b8)
| | * | Make accessibility work on Windows with alienJan-Arve Sæther2011-05-101-13/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that there will be no implicit conversion to windows handles anymore! Enabler for making QML accessible on windows. (cherry picked from commit a3ac7deb5dfe48c5fdd0e170c20b6852c3bb41de) Reviewed-by: Frederik Gladhorn (cherry picked from commit d289e54f2d2aa066cb383d8c8249bd7594bdf7b0)
| * | | ifdef out mac/no_coreservices path more cleanlyOswald Buddenhagen2011-05-101-3/+2
| | | | | | | | | | | | | | | | | | | | the symbian path was also dead (cherry picked from commit 76ac26383922b4c452592a9175e7f3b9b3fd2513)
| * | | fix build on symbianOswald Buddenhagen2011-05-101-0/+5
| | | | | | | | | | | | | | | | | | | | provide dummy implementation of QProcessEnvironment::systemEnvironment() (cherry picked from commit e4920a4b4bc454ad309324a62db0e9257bba7367)
| * | | Allow different text for undo actions and items in QUndoViewAlexander Potashev2011-05-103-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the texts used for undo actions and for items in QUndoView can be set separately. This introduces an extended format of text that can be passed to QUndoCommand::setText or QUndoCommand constructor. The action text can now contain two strings separated by a "\n". The first string (that goes before "\n") is then returned by QUndoCommand::text() and used as name of item in QUndoView. The second string (that goes after "\n") is returned by QUndoCommand::actionText() and used when the text properties of the undo and redo actions are updated. If the text passed to QUndoCommand does not contain "\n", everything works as before, and both QUndoCommand::text() and QUndoCommand::actionText() return the same string. Even though action text in English usually does not need different forms for undo actions and QUndoView item, translators can employ this new command text format, for example to adjust the grammatical case used in command text to match the context of "Undo %1"/"Redo %1". Merge-request: 2610 Reviewed-by: ossi (cherry picked from commit 9b784789c75d59b27530bbf1d12676cc44f64f46)
| * | | Allow using not only prefixes for undo command textAlexander Potashev2011-05-103-17/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions QUndo{Group,Stack}::create{Undo,Redo}Action() now use action text templates "Undo %1" and "Redo %1" if no custom prefix was provided. This makes more flexible translations possible. The surrounding text (like "Undo" and "Redo") can now be suffixed to the command name as German and Korean languages require ("%1 rueckgaengig machen" for German). Also, now the default action text (when no command can be undone) can be translated differently from the prefix. For example, it can be translated as "Undo action", not just "Undo". When a non-empty prefix is passed to QUndo*****::create****Action(), those functions work as before, and the features described above become unavailable. Task-number: QTBUG-14442 Merge-request: 1212 Reviewed-by: ossi (cherry picked from commit 213c25ad24e4f3b0a44f82f23d34746cd294f8d6)
| * | | QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the ↵Pino Toscano2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no-PATH_MAX case ... in the same way as done in the other code path. This makes qmake/QtCore compile again on glibc systems without PATH_MAX (e.g. GNU/Hurd). Merge-request: 1218 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit c8812fe6e642520532d65744caefcea790d59de8)
| * | | Do not allow multiple threads to acquire a QMutexBradley T. Hughes2011-05-101-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the mutex optimizations on Mac, we did not handle the case where semaphore_wait() could return KERN_ABORTED. Under heavy contention, this happens, and when running in release mode, the assert in qmutex.cpp is not executed. The code silently allows multiple threads to continue as if it had acquired the mutex exclusively. Fix this by checking for KERN_ABORTED from semaphore_wait(), and retry the wait. We do not handle KERN_ABORTED for timed waits, simply return false and let the code doing the tryLock() handle it how it deems best. Reviewed-by: joao (cherry picked from commit b54af0a9d6406356616889826e31925d2fa05718)
| * | | Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.Robin Burchell2011-05-102-18/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This case may be triggered in the (admittedly slightly abnormal) case where a user wishes to embed the calendar widget in a layout or, for whatever reason, do something else that will change its ownership. We work around this by detecting when it is deleted and recreating the widget. This will also have a positive side effect if setCalendarWidget() is called with a widget which is then subsequently deleted, returning the default widget instead of a pointer to (now deleted) memory. Reviewed-by: Denis Dzyubenko Merge-request: 2568 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> (cherry picked from commit 124ec3200f8453142717fcfe7a4aa0a55164aaa6)
| * | | don't crash in QProcessEnvironment::systemEnvironment()Oswald Buddenhagen2011-05-102-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as the implementations moved to platform-specific files, the QSharedDataPointer<QProcessEnvironmentPrivate>::detach() specialization needs to go to the private header. Reviewed-by: thiago (cherry picked from commit c79246683a5033f605acd59d1c37d68381383a06)
| * | | HTTP backend: do not load resources from cache that must be revalidatedPeter Hartmann2011-05-101-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The header field "Cache-Control: must-revalidate" is a strict requirement for loading the resource from the server, and not reading it from the cache without revalidating first. With this patch, PreferCache will load such from the network instead of loading them from the cache, and AlwaysCache will throw a ContentNotFound error. Reviewed-by: Markus Goetz Task-number: QTBUG-18983 (cherry picked from commit 0e449f38894b1bd2dbb2f14206a011424679f063)
| * | | Compile fix for QLocale on Symbian.Denis Dzyubenko2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous change added new ELangEnglish_India that doesn't necesserally present in all SDKs. Reviewed-by: trustme (cherry picked from commit 154ab1cb4c4cdf34f21fc93b078f91cc79048bd4)
| * | | Added Kazakh language to the QLocale mapping table on Symbian.Denis Dzyubenko2011-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme (cherry picked from commit c6808af66d45541546b30c8e6de155b9812b4ef9)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 18:02:41 +0000