summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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.
| | * | Fix a bug in syncqt.Liang Qi2011-05-111-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the generation of version header file before the sync of header files. Reviewed-by: TrustMe
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-1184-60/+192
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: tests: fix private header inclusion in qtbase autotests tests: disable tests in qtbase which depend on qtsvg tests: make benchmarks compile or disable those which don't compile tests: remove references to benchmark directories which don't exist tests: enable compilation of autotests for qtbase by default tests: make tst_qrawfont compile for QGlyphs -> QGlyphRun API change tests: mark some tests as using private API
| * | | 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-1112-0/+81
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * '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-1012-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide version info for each library like QTCORE_VERSION and etc. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-101-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Prevent having Status undefined in xlib platform plug-in.
| * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-10155-2302/+3578
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (142 commits) ifdef out mac/no_coreservices path more cleanly fix build on symbian Allow different text for undo actions and items in QUndoView Allow using not only prefixes for undo command text QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case Massively update the hurd-g++ mkspec. Do not allow multiple threads to acquire a QMutex Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget. don't crash in QProcessEnvironment::systemEnvironment() HTTP backend: do not load resources from cache that must be revalidated Compile fix for QLocale on Symbian. Added Kazakh language to the QLocale mapping table on Symbian. Added support for QLocale::uiLanguages on Symbian. Fix drawing text in item view: Add enablers for Symbian App Booster Don't rely on uninitialized data Don't realloc user-provided buffer qmake: Introduce new template type Make autotest more resilient against network timeout (cherry picked from commit 50be38737507f5c23b4d050e635a200024164a13) Do not filter adhoc clients (cherry picked from commit 4fe5307af44a76b99cc8c70aa330180c1985eabc) ...
| * \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-101-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Compile on Mac
| * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-104-20/+260
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Avoided calling updateAccessibility() from updateMicroFocus if the item was hidden Notify a11y framework of FocusChanges for QGraphicsObject Call updateAccessibility on the QGraphicsObject in updateMicroFocus Fix updateAccessibility for QGraphicsObjects Make accessibility work on Windows with alien
* | | | | | | | | move files in src/gui into their final locationsLars Knoll2011-05-1182-101/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the guikernel subdir to kernel and guiutil to util.
* | | | | | | | | No -rpath-link on Mac.Morten Sorvig2011-05-111-1/+1
| | | | | | | | |
* | | | | | | | | 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-11339-9884/+7886
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | tests: fix private header inclusion in qtbase autotestsRohan McGovern2011-05-1162-38/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any test which needs private headers from some Qt module must do: QT += modulename-private Reviewed-by: Jason McDonald Change-Id: I6924a577a960e4990f4379b02bca4822d8248fb4
| * | | | | | | | tests: disable tests in qtbase which depend on qtsvgRohan McGovern2011-05-112-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jason McDonald Change-Id: I2416d34b5c262e20ee18f7121e8745327d5614f8
| * | | | | | | | tests: make benchmarks compile or disable those which don't compileRohan McGovern2011-05-1113-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jason McDonald Change-Id: Idc9fa4722b59f9b75d5e4a91bbfd0ae068d29b3d
| * | | | | | | | tests: remove references to benchmark directories which don't existRohan McGovern2011-05-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jason McDonald Change-Id: I14d0981c9f962c4eb048ca426a8ba19aa7ea66de
| * | | | | | | | tests: enable compilation of autotests for qtbase by defaultRohan McGovern2011-05-112-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests are now treated like examples and demos: compiled by default, unless you configured with `-nomake tests'. (They are still not installed by default, however.) Reviewed-by: Jason McDonald Change-Id: Ifc56f6763bb2aafe6fe57b684751f99ec82ea26f
| * | | | | | | | tests: make tst_qrawfont compile for QGlyphs -> QGlyphRun API changeRohan McGovern2011-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken by 051ef6f294e8cbfa1e30e99e7fd4cf5fb38393f4 Reviewed-by: Jason McDonald Change-Id: Ia8589aba1bfb71d000d8fad455d90e704ba28972
| * | | | | | | | tests: mark some tests as using private APIRohan McGovern2011-05-114-1/+20
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These autotests are all using private symbols, available only when Qt is configured with -developer-build. So, gracefully disable them when the private symbols are not available. Reviewed-by: Jason McDonald Change-Id: Iafd1c7af486feeee810110bc021e75984827f78a
| * | | | | | | 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)