summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove duplicate check in qtextcontrol cursorMoveKeyEvent()Kent Hansen2011-10-111-3/+0
| | | | | | | | | | No reason to check for QKeySequence::MoveToPreviousLine twice. Task-number: QTBUG-20482 Change-Id: Ib1504be33908fa7cbc27226060f94794c454681c Reviewed-on: http://codereview.qt-project.org/6050 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* QtBase: Move idc to Active Qt.Friedemann Kleint2011-10-105-361/+2
| | | | | | | | | Remove include path to Active Qt from qt.prf. Change-Id: I476152ce56e47b573f5c835ec1347e772c4e9c3e Reviewed-on: http://codereview.qt-project.org/6355 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Make all uses of QBasicAtomicInt and Pointer use load() and store()Bradley T. Hughes2011-10-101-4/+4
| | | | | | | | | | Change Ie3271abd1728af599f9ab17c6f4868e475f17bb6 didn't build on Mac in debug mode. This commit fixes the build. Change-Id: I925af83ea577228b60679af804aa7875a779ec3f Reviewed-on: http://codereview.qt-project.org/6331 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Removed src/gui/opengl/qopenglcolormap.*Samuel Rødal2011-10-103-404/+0
| | | | | | | | | | The QGLColormap API was used by QGLWidget, not very relevant in the Qt 5 core API. Change-Id: I3c75ac09cbc292e707aea62759c09277f834de8d Reviewed-on: http://codereview.qt-project.org/6333 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed some doc errors in QOpenGLFramebufferObject.Samuel Rødal2011-10-102-31/+14
| | | | | | | Change-Id: Ic132bc31f87900a492a80767aa247c71c48c4a10 Reviewed-on: http://codereview.qt-project.org/6334 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fixed missing snippets for QOpenGLShaderProgram.Samuel Rødal2011-10-102-3/+97
| | | | | | | Change-Id: Ie44edb3379f6fef4c4c8b69bb5e36fc19154ab26 Reviewed-on: http://codereview.qt-project.org/6332 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QUnifiedTimer: Add callback for timer ticks. Used for profilingChristiaan Janssen2011-10-102-1/+12
| | | | | | | | Change-Id: Ia7cf823dee7f0b491db2f041d29cdfc0e385f18e Reviewed-on: http://codereview.qt-project.org/6253 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add some snippets from qtdoc.Casper van Donderen2011-10-1010-0/+426
| | | | | | | | | | | These snippets where in qtdoc before, to modularize the documentation they move to qtbase instead. Change-Id: Icf430b6d0a0b26c9466b7df4d51721b53e5239cf Reviewed-on: http://codereview.qt-project.org/6237 Sanity-Review: Jerome Pasion <jerome.pasion@nokia.com> Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Use freetype font engine on WindowsOlli Werwolff2011-10-1016-27/+700
| | | | | | | | | | | | | | | As windows' fontdatabases also uses functionalities from qbasicunixfontdatabase it was renamed to qbasicfontdatabase. But instead of iterating over the font directories' files it uses system calls to obtain the list of fonts and uses registry values to find the according filenames to add. The native font engine was still kept. It can be activated by adding fontengine=native as platformargument. Change-Id: I7197bed5d18b8a33d4aa97ce91bfa1cd281b80ea Reviewed-on: http://codereview.qt-project.org/5839 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Sanity-Review: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Easier shader debuggingJani Uusi-Rantala2011-10-101-8/+48
| | | | | | | | | | - Dumps out also the source code of the failed shader if available Change-Id: I9ae80e6a6749446c5ff54db1bc324cc7411a81a7 Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com> Reviewed-on: http://codereview.qt-project.org/6269 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Enable using the new Qt::ScreenOrientation enum as flagsJani Uusi-Rantala2011-10-101-5/+10
| | | | | | | | | | | | | Going to be useful later on in multiple places... - Respecified Qt::ScreenOrientation as bit values - Added Qt::ScreenOrientations QFlags definitions Change-Id: Ib7648d23de79ea5f88d617015bc98efcf903a8f3 Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com> Reviewed-on: http://codereview.qt-project.org/6268 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Minor build fix for newer XCB versionsJani Uusi-Rantala2011-10-101-0/+1
| | | | | | | | | | - Defines XCB_WM_STATE_WITHDRAWN as XCB_ICCCM_WM_STATE_WITHDRAWN if necessary Change-Id: I4212a0e1d7f14ac6695d23d6586dd97f898d3f2b Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com> Reviewed-on: http://codereview.qt-project.org/6267 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Clean-up a macro for CocoaMorten Sorvig2011-10-1082-9880/+89
| | | | | | | | | Remove the usage of Q_MAC_USE_COCOA and Carbon code paths. Change-Id: Ib569ad8c6d9ffe258f454b3c3b06e95294a10112 Reviewed-on: http://codereview.qt-project.org/5100 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Sanity-Review: Morten Johan Sørvig <morten.sorvig@nokia.com>
* update QmlTest option usage helpCharles Yin2011-10-101-1/+1
| | | | | | | Change-Id: I8ccd49bcaac126af2bad2382d481857f1e48c18b Reviewed-on: http://codereview.qt-project.org/6274 Reviewed-by: Charles Yin <charles.yin@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Make sure window state is synced back to Qt from the XCB plugin.Samuel Rødal2011-10-073-3/+49
| | | | | | | | | | We should properly react to the property notify events. Task-number: QTBUG-21856 Change-Id: I0d2aa90b7d8da3b96acf4d88684b0200de7d7413 Reviewed-on: http://codereview.qt-project.org/6266 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed potential issue in XCB plugin.Samuel Rødal2011-10-072-9/+10
| | | | | | | | | | Use the actual atom instead of the enum value of the atom when signaling that the event loop should exit. Change-Id: Ib98c6a46cadcecc727b28411b4c0c12c434ea828 Reviewed-on: http://codereview.qt-project.org/6265 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Added Orientation API to QScreen and QWindow.Samuel Rødal2011-10-0723-104/+519
| | | | | | | | | | | | QScreen now has a primary and current orientation, and a QWindow can set its orientation as well. The current screen orientation is just a hint to the application. Change-Id: I4635982cfac2d16634d4edd5c6ab78e9d0ac55a4 Reviewed-on: http://codereview.qt-project.org/5988 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix QMouse/Wheel/TouchEvent::modifiers with the XCB back-endSimon Hausmann2011-10-076-45/+56
| | | | | | | | | | | | The modifiers are provided by X and need to be propagated through the QWindowSystemInterface. Change-Id: I127d0b6e9918b558ca15d9302c4cc0cbd94eb757 Reviewed-on: http://codereview.qt-project.org/6244 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com> Sanity-Review: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fixed crash due to uninitialized pointer in OpenGL texture glyph cache.Samuel Rødal2011-10-071-0/+1
| | | | | | | | Change-Id: I384f82f1549a81e19566484e12c75ce8df1f314f Reviewed-on: http://codereview.qt-project.org/6149 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* qwindowsstyle: Remove duplicate flag in maskKent Hansen2011-10-071-1/+1
| | | | | | | | | | Adding State_Sunken once should be enough for everyone. Task-number: QTBUG-20482 Change-Id: Ic5c1bf47283d9c344eda41c766749d4106a8da67 Reviewed-on: http://codereview.qt-project.org/6051 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Improve QMenu test coverage for Mac and WinCE.Jason McDonald2011-10-071-1/+1
| | | | | | | | | | Add a couple of previously excluded lines of code that should work for all platforms. Change-Id: I5f0b5365060a91cb708a3143b28f7de703fc419e Reviewed-on: http://codereview.qt-project.org/6196 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove redundant qWarning's.Jason McDonald2011-10-072-6/+2
| | | | | | | | | | The removed warnings just repeat information that is already in the QSKIP's that immediately follow the warnings. Change-Id: Id13158487e8075aab8a8f48955303edde3f4af63 Reviewed-on: http://codereview.qt-project.org/6194 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove redundant define.Jason McDonald2011-10-071-5/+0
| | | | | | | | | | Q_CHECK_PAINTEVENTS was guaranteed to be defined prior to the code that was conditional on it being undefined. Change-Id: I8b48a2c6bff997de7d0e3f640203308718dd865b Reviewed-on: http://codereview.qt-project.org/6193 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Comment out test that is always skipped.Jason McDonald2011-10-071-6/+6
| | | | | | | Change-Id: I0af7a5c6708d09ce9b63b7c177d31e0631da43cd Reviewed-on: http://codereview.qt-project.org/6192 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove dead code and empty test functions.Jason McDonald2011-10-074-29/+0
| | | | | | | Change-Id: Iaf8ac514d814c9321f8dcd09b2bf3331f87154e6 Reviewed-on: http://codereview.qt-project.org/6191 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fail test in preference to calling qFatal.Jason McDonald2011-10-071-4/+2
| | | | | | | | | Calling qFatal may result in test output not being well-formed. Change-Id: Ia16bade4d3311485c6ba4dd23d5624d18b192b71 Reviewed-on: http://codereview.qt-project.org/6190 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* No need to return after QSKIP.Jason McDonald2011-10-077-44/+16
| | | | | | | | | QSKIP already causes the test function that calls it to return, so the returns removed by this commit were unreachable. Change-Id: I1fa2f3a3271927d8a600b02d8b31bd81db9146b1 Reviewed-on: http://codereview.qt-project.org/6188 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Avoid using QSKIP in lieu of compile-time checksJason McDonald2011-10-0717-182/+191
| | | | | | | | | | | | | | | | QSKIP is intended to be used to skip test functions that are found at run-time to be inapplicable or unsafe. If a test function can be determined to be inapplicable at compile-time, the entire test function should be omitted instead of replacing the body of the test function with a QSKIP, which only serves to slow down test runs and to inflate test run-rates with empty, inapplicable tests. Task-number: QTQAINFRA-278 Change-Id: I95feba3edbfa092c0ef4d85bb8c6877bd6be698e Reviewed-on: http://codereview.qt-project.org/6128 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete test functions.Jason McDonald2011-10-071-205/+0
| | | | | | | | | | Commit 2cbeb6c08cb7c79d6126f75c2cbc470679d671e1 made these test functions obsolete. Change-Id: I89a379d7228584a83e9d7674060081f4201f561c Reviewed-on: http://codereview.qt-project.org/6113 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Eliminate needless QSKIPs in qaccessibility test.Jason McDonald2011-10-071-174/+139
| | | | | | | | | | | | On Unix the table1 interface was replaced by the table2 interface, while table1 is still used on other platforms. This commit changes the test so that only the applicable test functions are built and run, where previously both sets of tests were built and one set would always skip. Change-Id: I5a785fb88fcbf4e5896e1fdb80c7c0a659597e34 Reviewed-on: http://codereview.qt-project.org/6097 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Don't default to XCB if it is not enabled.Lincoln Ramsay2011-10-072-1/+7
| | | | | | | | | | | Default to wayland unless it's not enabled. Default to minimal otherwise. Change-Id: I0fa523eae395821a7cb0cabbb27ca073e594246f Reviewed-on: http://codereview.qt-project.org/5945 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix QFont::defaultFamily() in the new QPA world.Pierre Rossi2011-10-073-9/+58
| | | | | | | | | | This is so that the results of LayoutTests in WebKit are more in line with what things were like in Qt 4.8. Change-Id: I25962e03bd8e0316cb303c0d94c25ac4e73ea9a8 Reviewed-on: http://codereview.qt-project.org/6162 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Fix the QNetworkConnectionManagerPrivate initialisation code.Thiago Macieira2011-10-062-22/+46
| | | | | | | | | | | | | | | | | | | | | | | | The current code was meant to be a thread-safe initialisation that also ran a couple of extra steps. But it wasn't. While it's ok to call qAddPostRoutine(), the call to updateConfigurations() was thread-unsafe. It is possible that another thread got the pointer to the Private before updateConfigurations() finished. So instead protect the initialisation with a mutex. It's possible that the value of the pointer becomes visible to other processors before the other contained values, so use atomics here. To call qAddPostRoutine safely from the main thread, use the trick of deleteLater() (which is thread-safe) in another thread connecting to a slot. Change-Id: If9bab88138755df95a791f34b0be8684207979d7 Reviewed-on: http://codereview.qt-project.org/5028 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Removed some dead code from QWidgetLineControlPekka Vuorela2011-10-063-147/+46
| | | | | | | | | | | There was a big processEvents() method which was actually getting called for a single type of events. Change-Id: I66ac70c7ac6e2f9136b24541d42a4185f8797583 Reviewed-on: http://codereview.qt-project.org/6132 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* fix QChar::isSpace() to handle codepoint U+0085Konstantin Ritt2011-10-063-3/+15
| | | | | | | | | | | according to the Unicode specs, code point U+0085 should be treated like a white space character (an exceptional Cc one) Change-Id: Ib17ae0c4d3cdafe667cafa38b645138ef24c238c Merge-request: 32 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-on: http://codereview.qt-project.org/6158 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fix incorrect QFileInfo permissions on windowsShane Kearns2011-10-061-1/+1
| | | | | | | | | | | | | | | Requesting the write permission marked the read permission as known without having retrieved it. A subsequent request for read permission would return false. Task-Number: QTBUG-20714 Reviewed-By: mread (cherry picked from commit bf69c7e0af67ec877da4fee244386e538fa1c01d) Change-Id: I74fd118fcdd3b222098eda2718823a36931424a1 Reviewed-on: http://codereview.qt-project.org/6159 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Merge fixes for QDir::operator==Shane Kearns2011-10-063-3/+43
| | | | | | | | | | | | | | | | | | There were two fixes in 4.8 which each fixed a part of the problem. Comparing canonical paths is more correct, but is only possible where both directories exist. If neither directory exists, then compare absolute paths instead. Changed a regression test, because /tmp is a symbolic link on MacOS. I.E. "/tmp/.." is canonically "/private" and not "/" as expected. Task-Number: QTBUG-20495 Reviewed-By: joao (cherry-picked from ad35d25e78c8252a72108a4ba931934047c4707e) Change-Id: Ia4986e8337f0e512e1a3398a5a4dd36e62680b9c Reviewed-on: http://codereview.qt-project.org/5813 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Make QLineEdit unit test pass againPekka Vuorela2011-10-061-4/+8
| | | | | | | | | | | | Widget failed to update cursor position if selection remained the same, but changed direction, and did not emit selectionChanged if change resulted from input method event. Change-Id: I6a4ae48d41efa5e126980749f89982f92e3ec499 Reviewed-on: http://codereview.qt-project.org/6131 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QHostInfo: fix a race condition under CEKonstantin Ritt2011-10-061-2/+3
| | | | | | | | | | Merge-request: 1339 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Change-Id: Id1f977ad8f746ac848c355880cac688e256721d8 Reviewed-on: http://codereview.qt-project.org/6145 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Create auto test for http HEAD requestShane Kearns2011-10-063-0/+65
| | | | | | | | | | | | This is in order to have a regression test for QT-5304. However the test is also checking basic functionality of head requests too. Task-Number: QT-5304 Change-Id: I0d98bd1f1125ffd49d9f3c859a51b2aaee95379a Reviewed-By: Martin Petersson Reviewed-on: http://codereview.qt-project.org/6033 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Fix QDir::operator==(const QDir &) constJoão Abecasis2011-10-063-3/+10
| | | | | | | | | | | | | | | | | | | We can't rely on absolute paths when comparing directories for equality as these don't take into account symbolic links and may also bypass ../ and ./ simplification. Instead, canonical paths must be computed and can then be compared according to the case sensitivity rules for the platform or file engine, as is done in QFileInfo. Task-number: QTBUG-20495 Reviewed-by: Prasanth Ullattil (cherry-picked from dcee6e1371d899eb79717b8e3f3eec08b765db82) Change-Id: Ib5f2a6ee11311c55782ea5dd0e9c3b45f9231686 Reviewed-on: http://codereview.qt-project.org/5812 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Compile on 10.6Morten Sorvig2011-10-061-2/+8
| | | | | | | Change-Id: Ifce1ab6ced179f68a3d08162940e9092b90beb11 Reviewed-on: http://codereview.qt-project.org/6124 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Remove duplicate check in utf endian detectionKent Hansen2011-10-061-14/+12
| | | | | | | | | | | This was excessive paranoia. Task-number: QTBUG-20482 Change-Id: Ia0c76651773e12f25ec5d62675d6f317b8d2df13 Reviewed-on: http://codereview.qt-project.org/6045 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix typo in qbezier shift implementationKent Hansen2011-10-061-1/+1
| | | | | | | | | | Multiplying by zero was not the intention. Task-number: QTBUG-20482 Change-Id: I3c4dfd69da4d98ed65f318d1fa0c3cf827017688 Reviewed-on: http://codereview.qt-project.org/6048 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Improved logical and physical DPI APIs.Samuel Rødal2011-10-0624-59/+165
| | | | | | | | | | | | | | Made physicalSize() return QSizeF instead, to prevent rounding errors. Added logicalSize() as the base to compute font pixel sizes instead, and added convenience functions in QScreen to access the logical and physical sizes and DPI metrics. Task-number: QTBUG-21736 Task-number: QTBUG-21737 Change-Id: Ic705dc98eb3632617659e65a0c9a552673dc0c65 Reviewed-on: http://codereview.qt-project.org/5888 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove redundant assignment in QXmlStreamReaderKent Hansen2011-10-061-1/+0
| | | | | | | | | | Setting tos to 0 once should be enough for everyone. Task-number: QTBUG-20482 Change-Id: I7aa46ff5d4ed8064e3fb2cebc3dfcaa4e73741f8 Reviewed-on: http://codereview.qt-project.org/6053 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Fix unreachable QSKIP in QMenu autotestJason McDonald2011-10-061-5/+2
| | | | | | | | | The QSKIP is only reachable on Mac, so only compile it for Mac. Change-Id: I268e87829e01755051f81cdaf856d936b04b3d49 Reviewed-on: http://codereview.qt-project.org/6091 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve formatting of QMenu autotestJason McDonald2011-10-061-95/+55
| | | | | | | | | Remove literal tabs and empty functions. Bring layout closer to Qt coding guidelines. Change-Id: I4f1b214c69ee9bfe46c3275eb224e38df15e8744 Reviewed-on: http://codereview.qt-project.org/6090 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Tidy qsqldatabase autotestJason McDonald2011-10-061-39/+18
| | | | | | | | | Remove unused macro and remove redundant returns after calls to QSKIP. Change-Id: Ie333801cbec6c3123931f2fedbcd8902cab69a2e Reviewed-on: http://codereview.qt-project.org/6021 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Logic does not match error message.Lincoln Ramsay2011-10-061-1/+1
| | | | | | | | | | Passing -no-xcb or -no-wayland was enough to get a build with neither but the error message says you need to pass both. Fix the logic. Change-Id: I2d554d371b603e7df7bc07e1b4d5271ba31243f0 Reviewed-on: http://codereview.qt-project.org/6099 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>