summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QSurfaceFormat: Use version in comparison and debug, fix setter.Friedemann Kleint2011-10-181-5/+13
| | | | | Change-Id: Id123ca9366b97a172e08a4608ccdffafb7caaf09 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make some more methods privateLars Knoll2011-10-181-9/+7
| | | | | Change-Id: I0644ee287201866596dccd96e443e7e62fd89360 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* make fromWCharArray() and toWCharArray() inlinedKonstantin Ritt2011-10-182-27/+25
| | | | | | | | | because we may have the size of wchar_t varying, we need to know which is the correct encoding: UTF-16 or UCS-4 Merge-request: 49 Change-Id: Ib5a1e7dea51d0cd8394e686634a36aae984fa072 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move QShortcutMap to QtGuiLars Knoll2011-10-188-11/+5
| | | | | | | | | QShortcut stays in QtWidgets, what we need in QtGui is only the basic functionality of the shortcut map. QML can integrate directly with the map where required. Change-Id: Ie39e9242f24cbebf824e5c3d2926880325ea4187 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Move the widget dependent code away from the shortcutmapLars Knoll2011-10-184-225/+218
| | | | | | | | | qshortcut.cpp now has the honour of hosting the code that detects whether the a given shortcutcontext is actually valid. Change-Id: I59d299bbd2fd62fca074a51d96e85b81a50ae73c Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Do not call swapBuffers when surfaceHandle is NULL.Laszlo Agocs2011-10-181-1/+3
| | | | | | | | | | Calling swapBuffers with the surfaceHandle of 0 returned by QWindow during application exit causes a crash when using GLX. The patch avoids swapBuffer calls to platformGLContext when there is no surface handle anymore. Change-Id: I09c5bbafd4e7af6648ca54a58ed0267d0a2f343d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Include threads docs from qtdoc, rename old threads to threads-basics.Casper van Donderen2011-10-182-494/+1199
| | | | | Change-Id: Ie603582809e61c2e46566a46cfc81fead4168aad Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Remove stale documentation.Casper van Donderen2011-10-1821-565/+31
| | | | | Change-Id: I85139e0334b648bee0d18129cef9387dcc6c3222 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Remove Q_WS_ in text codecs.Friedemann Kleint2011-10-1812-34/+34
| | | | | Change-Id: Id27d82f91a21107f31f73d7f2920629a512dc2a1 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* OpenGL: Remove Q_WS_ defines.Friedemann Kleint2011-10-186-76/+0
| | | | | Change-Id: I351a910968ff7f46550af5b3742959cb0cab540d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Prefer QSKIP to QTEST_NOOP_MAIN.Jason McDonald2011-10-183-91/+42
| | | | | | | | | Use QSKIP instead of QTEST_NOOP_MAIN so that the user receives a clear indication that these tests aren't testing anything when the required defines are not defined. Change-Id: I977e24205a1bb7787ecddbdb1ebbeda1f2ded321 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Prefer QSKIP to QTEST_NOOP_MAIN.Jason McDonald2011-10-182-16/+26
| | | | | | | | | Use QSKIP instead of QTEST_NOOP_MAIN so that the user receives a clear indication that these tests aren't testing anything when the required defines are not defined. Change-Id: I8508f50c6264fafa836090c5d6ffa6ce02dda102 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Reduce the runtime of tst_selftestsRohan McGovern2011-10-181-0/+6
| | | | | | | | | | | The addition of testing for multiple loggers greatly increased the total runtime of this test, in fact making it the slowest testcase in Qt. Fortunately this is only due to a couple of slow subtests whose behavior is unlikely to be affected by the loggers. Change it to run these slow subtests just for a couple of loggers, instead of all the combinations. Change-Id: Ie90f6c0ca29470ed6a7c4e2e185f852602a2d162 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix TouchEnd events not being received on Harmattan.Jocelyn Turcotte2011-10-171-2/+3
| | | | | | | | | TouchEnd is sent when all the touch points have a TouchPointReleased state, and we would clear all touch points on finger release before sending them up the stack. Change-Id: I14e7347090ce9a1865743202f6926ae2fc035bd3 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Add multipoint touch support for Harmattan to the xcb platform plugin.Jocelyn Turcotte2011-10-178-1/+517
| | | | | | | | | | | Proper multipoint touch support was only introduced in XInput2.1, but Harmattan uses a tweaked version of XInput2.0 that transfers touch data through mouse events. This patch applies on the xcb plugin a subset of the changes that were applied on the Qt 4.7 that was shipped to Harmattan to get similar multipoint touch support. Change-Id: Ifda7ad40de29d7ded1443d4f78b3ec3807303a9f Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Fix TouchPoint::lastPos() after TouchPointStationary only events.Jocelyn Turcotte2011-10-171-1/+5
| | | | | | | | | | | | | | | | | lastPos is copied from the last point's position, and the position has to be resolved according the the receiving item's transformation. However, if a QTouchEvent contains only stationary points, it won't be delivered, it's pos()/rect() will still be uninitialized, and the touch point of the next event will be delivered with the uninitialized pos() as it's lastPos(). This patch makes sure that the lastPos() won't be filled with a previous incomplete stationary point state even if the platform is sending us stationary-point-only touch events. Change-Id: Ia7d10423c8fbe78348edbb0a89fbfa66d1b8b5d1 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* Fix scaled text rendering with the raster paint engine & FreeTypeSimon Hausmann2011-10-171-0/+7
| | | | | | | | | | | | | | | Before commit 070d9c00c488a5ee6811f04170cf488ead79bf80, the raster paint engine used to call loadGlyphs() on the FT engine, which ensures that the glyphs are loaded and (more importantly) that the correct transformation matrix is applied on the freetype face. After commit 070d9c0 lockedAlphaMapForGlyph is called for each glyph, which unfortunately doesn't respect the provided transformation matrix. Therefore when drawing scaled text, it was never actually scaled. This patch applies the combination of the fontengine transform and the requested transform on the freetype face actually used, similarly to loadGlyphs. Change-Id: I0956a9e71784582db6bb90475a001a63800773f4 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Add documentation from qtdoc for modularization of docs.Casper van Donderen2011-10-173-0/+913
| | | | | Change-Id: Ic9c4502f19ff077d8416ccb890678e64490349ca Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Use a QFunctionPointer for getProcAddress()Casper van Donderen2011-10-172-10/+3
| | | | | | | | qdoc does not understand the void (*) syntax, there is a typedef to QFunctionPointer that does work. Change-Id: Idbe9d43d00f8676304d088d72795b6ddb7e4ee72 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Replace Q_WS_WIN by Q_OS_WIN in uic/network.Friedemann Kleint2011-10-173-7/+3
| | | | | Change-Id: I592936859f6932fcd1aa47f0617ba9f8efee86dc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Prefer QSKIP to QTEST_NOOP_MAIN.Jason McDonald2011-10-172-9/+25
| | | | | | | | | | | | | There is no way for a .pro file to know if exceptions are supported in the Qt build, so these tests cannot be omitted from the build if exceptions are not supported. Because of this limitation, these tests were using QTEST_NOOP_MAIN when exceptions were not available, making the tests appear to pass. This commit changes QTEST_NOOP_MAIN to QSKIP, so that the user receives a clear indication that the test isn't testing anything when exceptions are not available. Change-Id: I2facf08ba69e6f985e2da50dd36ad2658246b22e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add a warning and a return value to xcb's createGLPlatformContextLaszlo Agocs2011-10-171-0/+2
| | | | | | | | | | | | | | | | | There was no value returned previously when none of GLX, EGL, DRI was enabled. Now we show a warning message and return null (resulting in a crash). Previously not returning a value resulted in obscure crashes with strange-looking call stacks, now it will be clear what the problem is. This is particularly important because not having libx11-xcb-dev installed results in silently disabled xlib support which in turn disallows the usage of glx too. The result is an obscure crash in any GL (e.g. QML2) app. Now there will be a proper warning message at least. Change-Id: I15cf3a6c16ca373d4ada7abb6d3c8f7e30c1e03d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Do not fail user time window creation when xcb is using xlibLaszlo Agocs2011-10-172-2/+8
| | | | | | | | | | | | | | | | | | | QXcbWindow::updateNetWmUserTime() creates a new window using the actual window as its parent. This operation was failing when Xlib usage and GLX (or EGL) was enabled because in these cases the real window was created with a different visual using XCreateWindow. For the user time window however we were passing the xcb_screen's root_visual always, and this cannot work when Xlib+GLX/EGL is in use, resulting in a BAD_MATCH (followed by some annoying flicker on the screen on Ubuntu at least, or a full log off (X crash?) on Fedora). The patch saves the visual id used to create the actual window and passes that when creating the user time window. This way the creation of the user time window succeeds with Xlib+GLX too. Change-Id: If3925d9ac1670d385dcc7c2b475c196908569f06 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove qcopchannel autotest.Jason McDonald2011-10-177-265/+0
| | | | | | | The QCopChannel class was removed during Qt5 refactoring. Change-Id: I62914eca1db65c680d90233ce9dad5d891890c4a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Don't build empty tests.Jason McDonald2011-10-173-12/+5
| | | | | | | | | The qgraphicswidget and qgraphicsproxywidget tests are empty if Qt is built without the cleanlooks style, so don't build the tests in that case. Change-Id: I2308e723a9b0abcc3e95b32a562fcb02afe0444d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Only build exceptionsafety_objects test if usefulJason McDonald2011-10-172-5/+4
| | | | | | | | The test appears to be applicable only if building with g++, and even then the test is broken. Change-Id: I9eefb13325a10ec295a59c2bd1111e3c324ff94f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove Mac accessibility autotest.Jason McDonald2011-10-1718-852/+0
| | | | | | | | This test was empty, the logic having been recently removed because it only applied to the Carbon UI, which will not be supported by Qt5. Change-Id: I2b5d6aba6be4a51eadbac3ca9d19d1a68c4fc1ab Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Tidy qwizard autotest .pro fileJason McDonald2011-10-171-7/+0
| | | | | | | Remove commented out sources and redundant Symbian-specific directive. Change-Id: I7637b4dfc186eeac7f314faf13aa97e8ef1990de Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove QtMD5 autotest.Jason McDonald2011-10-175-117/+0
| | | | | | | | | This test is only valid with obsolete Qt Solutions packages. Any Qt Solutions that are still of value need to be rewritten as Qt5 addons and will be delivered with their own unit tests. Change-Id: I099ef816655cc7de13715f5a4e5f4a06099df2d5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make test .pro files more consistent.Jason McDonald2011-10-173-21/+35
| | | | | | | | Make the parent .pro files follow the pattern of listing all tests in one place and then removing inapplicable tests as needed. Change-Id: Ide1ae98d50dd63cd8c1b4d6fd53135cdff801bc3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Don't build empty qwineventnotifier test.Jason McDonald2011-10-172-8/+3
| | | | | | | | This test is only useful on Windows, so avoid building it elsewhere rather than building an empty test. Change-Id: I01d91266bcb2dd242e02e70741ad5b81a13c33f0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove redundant logic from tools autotests.Jason McDonald2011-10-172-11/+0
| | | | | | | | The tools tests are not built for cross-compiled Qt builds, so the logic to make those tests empty when cross-compiled is redundant. Change-Id: Ia3a3a680d7ade2cee78aa633b41c9ef5be6f2f15 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Don't build empty qaccessibility test on WinCE.Jason McDonald2011-10-172-10/+2
| | | | | | | | Rather than building the test with all the logic #ifdef'd out, just avoid building the test at all. Change-Id: I394f48b2dacb40325d03de719096da36fcb7312a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Only build Mac-specific tests on Mac.Jason McDonald2011-10-174-29/+7
| | | | | | | | | All but one of these tests was already excluded from the build on non-Mac platforms, but still had #ifdef's to make the test empty if compiled on a non-Mac platform. Change-Id: I1a3677c1cdb7bd467cf4317ed4cfbac89e934e76 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Less friends is good, at least for C++ code :)Lars Knoll2011-10-172-3/+0
| | | | | Change-Id: Ia46359ee80eb30b8e16a02b7d5376cc9610fac84 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QHttpNetworkConnection: fix compile warningMartin Petersson2011-10-141-2/+2
| | | | | Change-Id: I05f114dcb1c43a98c416d02b3e764dcb40d56e09 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Add QGlyphRun::SplitLigature flagEskil Abrahamsen Blomfeldt2011-10-143-28/+49
| | | | | | | | | | | | | If the glyph run is generated based on characters which split a ligature glyph, it needs to include the ligature glyph in the run, and when painting, we need to clip the painter to the reported bounding rect of the run in order to avoid painting too much of the ligature. To make it possible to reduce clipping to a minimum, we need a flag to inform of whether the glyph run contains a split ligature or not. Change-Id: Id787e0bec6d6e8e06cc818700ae0fca22cf81e98 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Disable ELF interpreter check when cross-compilingHarald Fernengel2011-10-141-1/+1
| | | | | | | | It's not a good idea to look at the host's /bin/ls when cross-compiling Change-Id: I1fe67b17abd92f01c1d89146227c5419eaa3242f Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake: fix incrementalLinker option writing for vcxprojJoerg Bornemann2011-10-141-1/+1
| | | | | Change-Id: I7d3b33a3a2e2f7c89ea956cd1304e7d2e365151f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Avoid using 0 as the default winId in QPlatformWindow.Laszlo Agocs2011-10-141-1/+8
| | | | | | | | | | | | | | | | | | | When the platform plugin does not reimplement QPlatformWindow::winId() to return a non-zero value, the default implementation provides a WId of 0. This breaks various scenarios with QWidgets which, for example in nativeParentWidget(), rely on internalWinId() being non-zero for TLWs. As a result, apps like collidingmice will crash with the 'minimal' platform plugin when they try to do markDirtyOnScreen for the graphics view's viewport widget because viewport()->nativeParentWidget() unexpectedly returns null, even though it should return the QGraphicsView. The patch makes the default value WId(1) in order to to avoid this. Change-Id: Iafef2e510e32b5610b8cef742313e9119ed64963 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make the window active in eglfs and minimal plaform plugins.Laszlo Agocs2011-10-142-2/+6
| | | | | | | | | | | | | | | | Without a call to QWindowSystemInterface::handleWindowActivated() or QPlatformWindow::requestWindowActivated() QGuiApplication's activeWindow() and focusWindow() will return 0 all the time, and this breaks key event delivery when key events are received not from a windowing system but directly from e.g. evdev. In such cases the only choice is to send the event to the active window but if there isn't one the event will be lost. These platforms will have one fullscreen window at a time so marking it the active one should be a safe assumption. Change-Id: Ia6f0e9f021fbd61bbd368ddc46f8a13fccda1c2f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove commented out reference to QShortcutMapLars Knoll2011-10-141-9/+0
| | | | | | Change-Id: I62ca413c4f5e11e5ba91dcbb05d8088ca1d7a2b9 Reviewed-on: http://codereview.qt-project.org/6582 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add autotest for QMetaType creation of gui typesKent Hansen2011-10-143-0/+280
| | | | | | | | | | This test verifies that all gui types with built-in QMetaType support can be created, either using the default constructor or the copy constructor. Change-Id: Ibb1c5aab8571b598638c74112471d6869516a202 Reviewed-on: http://codereview.qt-project.org/6344 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Improve the QMetaType::create() autotest coverageKent Hansen2011-10-141-5/+280
| | | | | | | | | | It only tested creating a copy of QSize. This change adds testing of all core types, both copy and non-copy creation. Change-Id: If2b8fb45718c4a976dd8b883b332878f7fb0da6f Reviewed-on: http://codereview.qt-project.org/6343 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove dependencies of QShortcutMap onto widgetsLars Knoll2011-10-148-43/+57
| | | | | | | | | This is the first towards bringing shortcut support back into QtGui. Change-Id: Ic2cf376d08c326402fb90a0cf170a987b07ac304 Reviewed-on: http://codereview.qt-project.org/6577 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Small re-factor of QVariant autotest.Jędrzej Nowacki2011-10-141-46/+50
| | | | | | | | | Enrich playWithVaraint template by a macro that returns correct line number in case of failure. Change-Id: I7684169852481a6905b71e4420135e7e3f298b12 Reviewed-on: http://codereview.qt-project.org/6570 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Accessibility plugin for mac and xcb.Frederik Gladhorn2011-10-145-1/+25
| | | | | | | | | | Instead of creating new instances of the class whenever accessibility() is called, create one on startup. Change-Id: Idd5b06ee935d7acf4934b98882d254a1ef0ca04e Reviewed-on: http://codereview.qt-project.org/6435 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Fix OpenGL on Harmattan showing only the first frame.Jocelyn Turcotte2011-10-141-0/+14
| | | | | | | | | | | | swapBuffers would wait until DRI2_InvalidateBuffers was received from the X server, but would never receive it since we are not running the xlib event loop. This patch calls the XESetWireToEvent xlib callback of an unhandled event from the xcb event loop directly, if one is available for its response type. Change-Id: I3b4ef3f6e3efbae25f49f161e229e9b15e951778 Reviewed-on: http://codereview.qt-project.org/6557 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Calculate an area in the touchscreen qpa plugin.Laszlo Agocs2011-10-132-3/+6
| | | | | | | | | | | | Instead of ignoring the touch major/minor and returning a rectangle with width and height of 1, the size of the area is now calculated based on the major. This is incomplete and far from perfect but at least it makes visualizers, like the fingerpaint example app, work out of the box. Change-Id: I3bb70b4d7247f289e5cae4e7de2460ecf2c9d009 Reviewed-on: http://codereview.qt-project.org/6566 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Remove Q_WS_ and Q_OS_SYMBIAN from QtGui.Friedemann Kleint2011-10-1374-2611/+5
| | | | | | Change-Id: I2ac3376513c3fbfc81a2e695a73a0d948d2696bc Reviewed-on: http://codereview.qt-project.org/6607 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 21:57:58 +0000