summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update keyToValue and keysToValue in QMetaEnumLiang Qi2011-10-192-10/+34
| | | | | | | | | | Add a ok return value for whether found or not. Task-number: QTBUG-21672 Reviewed-by: Olivier Goffart Change-Id: Ic0ea7455dccf1ac91705bcc1479444eb4091ded3 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Fixed missing return statement in QPrintSupportKevin Simons2011-10-191-1/+1
| | | | | Change-Id: I8da63b7d4c5a456b0150b14e089d8f5e69c6a70a Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Windows: Fix Geometry, OpenGL formatsFriedemann Kleint2011-10-192-10/+41
| | | | | | | | - Do not use size returned by GetWindowRect for child windows - Turn Open GL samples off if number is 1. Change-Id: I2f44606d965fe691548094771deda7bca51ef9a6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update V8Aaron Kennedy2011-10-1920-2702/+1504
| | | | | Change-Id: I7a9da7dbb2116a441788407d60ed10155cded941 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Refactor QAccessibleActionInterface.Frederik Gladhorn2011-10-1917-693/+341
| | | | | | | Some refinements done by Jan-Arve Sæther. Change-Id: I99195b3c7273316cfa9c46e451924bbcfddd11a9 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Introduce Q_STATIC_ASSERTJędrzej Nowacki2011-10-191-0/+9
| | | | | | | | | Example of message of failed assert (gcc 4.6, file tst_qglobal.cpp:300): tst_qglobal.cpp:300:92: error: invalid application of ‘sizeof’ to incomplete type ‘QStaticAssertFailure<false>’ Change-Id: Ic1798094f718eaad388d754034115aafbbb6bd5e Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Metatype: Silence MSVC warnings about unused variables.Friedemann Kleint2011-10-191-6/+6
| | | | | | | Turn around if's. Change-Id: Ica6f7f54098a567816ce3918f6fe5d8d2c072e01 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Widgets: Fix a startup crash in QSplashScreen (Linguist).Friedemann Kleint2011-10-191-2/+3
| | | | | Change-Id: I38f5920fb62277f97e9b3b45651527c2475556ac Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix "may be used uninitialized" compiler warning.Morten Sorvig2011-10-191-1/+1
| | | | | Change-Id: I96e9dbf0f3df527785e03661b9c25bd2d214cd44 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Provide API for "placement new" construction of meta-typesKent Hansen2011-10-194-21/+557
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By making it possible to specify the place in memory where a type should be constructed, any meta-type can be allocated on the stack, for example. In the QML/JS QObject binding, this makes it possible to call slots and access properties from JavaScript without having to perform any mallocs (e.g. due to QVariant creation) in the C++ <--> JS value conversion, in the best case. In addition to QMetaType::construct() and QMetaType::destruct(), this change introduces QMetaType::typeSize(), which returns the size of a type in bytes. This can be used to prepare a suitable buffer for constructing a type using construct(). Benchmarks indicate that in-place construction is 2-5x faster than normal construction for core and GUI types on linux-g++. Note that there is already a QMetaType::construct() function in Qt 4, which has been renamed to QMetaType::create() in Qt 5. In order to avoid existing usages of construct() in user code to call the Qt 5 construct() (when they really meant to call create()), the third argument ("copy") of construct() is made mandatory. Hence, calls to QMetaType::construct() written for Qt 4 will cause a compile error when compiled with Qt 5, and the user must adapt his code. Task-number: QTBUG-12574 Change-Id: I836f06f6ee1c1c3edbd199a03424c78c942bdd3e Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Widgets: Remove Symbian-specific code.Friedemann Kleint2011-10-1989-21772/+2
| | | | | | | Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Change-Id: Ieee43d6650f5b1968fc7d77e618096701ffef941 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Destroy generic plugins on exit.Laszlo Agocs2011-10-192-0/+9
| | | | | Change-Id: I9037cabae74f9a7d8743630d0f530aaa1593266f Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Remove DEPENDS_ON from qtestlib API.Jason McDonald2011-10-191-2/+0
| | | | | | | | | | The DEPENDS_ON macro didn't do anything and has misled many users to think that they can write test functions that depend on other test functions. Task-number: QTBUG-21851 Change-Id: Ibe65b2d5d88bb81b6a0ebbe0b220f7d409a1446c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Move QTRY_VERIFY/QTRY_COMPARE into testlib.Jason McDonald2011-10-192-2/+66
| | | | | | | | These functions have lived in tests/shared/util.h for a long time, but they really belong in qtestlib. Change-Id: I60d569d002dea220b51563931d8b7aa77a20b98b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove QTEST_NOOP_MAIN from qtestlib API.Jason McDonald2011-10-192-20/+0
| | | | | | | | | | | | | | This macro is no longer used in Qt's tests and encourages writing tests in a way that makes test reporting less accurate -- remove it to prevent further misuse. If a test can be determined at compile-time to be inapplicable, it should be omitted from the build via .pro file logic. If that is not possible (e.g. there is no suitable qmake variable), the test's initTestCase() function should call QSKIP to skip the entire test with a meaningful explanation. Task-number: QTBUG-21851 Change-Id: Icacc8c5567a700191b6ef3fa94ee52ede94c5b34 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove Sensors and Location related macros/defines from qglobal.h.alex2011-10-191-26/+0
| | | | | | | | | This reduces interdependencies between QtCore and other modules. Individual modules handle this by themselves. Change-Id: I82cb96326b8ccb0b6acb88d899ed811f80f47ec1 Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Cocoa: Add initial accessibility implementation.Morten Sorvig2011-10-198-4/+599
| | | | | | | | | | | | | | See qcocoaaccessiblity.h for details. For now only the first level of the hierarchy is made accessible. Also add tools/accessibilityinspector which is an utility for inspecting and debugging the Qt accessibility tree. Change-Id: Iff520bec26b3761feb0c2e00471feb379daaa735 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Windows platform: Improve Open GL.Friedemann Kleint2011-10-189-71/+155
| | | | | | | | | | | | | - Pass on version to ARB. - Query obtained ARB format more fine-grained depending on version, indicate failures - Fix GDI contexts and introduce gl=gdi to activate the GDI functionality - Adapt window flags after setParent if top level state changes - Remove unused OpenGL flag from integration/context Change-Id: I59ca74ee1fa727bd2bcfd605b3907bc82cca18fa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* 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>
* 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>
* 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-175-0/+384
| | | | | | | | | | | 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* Fix struct/class mismatch.Friedemann Kleint2011-10-131-3/+4
| | | | | | Change-Id: I282c9d9e10b0783cc10d32de031a30d07b802a55 Reviewed-on: http://codereview.qt-project.org/6610 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Cocoa: Update QPlatformWindow geometry on moveMorten Sorvig2011-10-131-0/+1
| | | | | | Change-Id: I976e4da646480d10cc6af444288c421d0645f689 Reviewed-on: http://codereview.qt-project.org/6541 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Migrate the touchscreen generic qpa plugin to QWindow.Laszlo Agocs2011-10-131-4/+5
| | | | | | | | | This plugin was still using QApplication and QDesktopWidget. The code is now migrated to QGuiApplication, QWindow, and QScreen. Change-Id: I22a7e15982efea16cbf560d09c8831cd82ed29d0 Reviewed-on: http://codereview.qt-project.org/6528 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>