summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add timestamp to QInputEvent.Laszlo Agocs2011-09-055-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mouse, touch, key events have no timestamp field currently, meaning that the timestamp passed to QWindowSystemInterface's handleMouse, Touch, KeyEvent functions will not be stored in the generated events. The timestamp can be quite valuable in some cases (e.g. when performing filtering of touch events) so losing this information is not desirable. The patch adds a timestamp field to QInputEvent, which is the base for mouse, touch, key, and other events, and also makes QGuiApplication to store the timestamp in the generated events. Change-Id: Icb9de8b238cb341916eac33ce21603f4955baca7 Reviewed-on: http://codereview.qt.nokia.com/4196 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Mark test as insignificantJo Asplin2011-09-051-0/+1
| | | | | | | | | | | | | | | | | | | | This change was missed out from a90f50942e5304e6bf1c8a3e32f1f65c7a38f60b Task-number: QTBUG-21133 Change-Id: I7365562c79515eb52221bff8bb4fbb9987c7425c Reviewed-on: http://codereview.qt.nokia.com/4123 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* | tests: mark `qstatictext' as using private APISergio Ahumada2011-09-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | This autotest is using private symbols, available only when Qt is configured with -developer-build. Change-Id: I9bf221040b8225ed173761c7ee23e69efd85c3cb Reviewed-on: http://codereview.qt.nokia.com/4148 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
* | Propogate that the size has changedJørgen Lind2011-09-021-1/+4
| | | | | | | | | | | | | | Change-Id: I73dde157e38933d39992cb4393297c0849ee1ae2 Reviewed-on: http://codereview.qt.nokia.com/4149 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* | micro optimizationsKonstantin Ritt2011-09-023-91/+40
| | | | | | | | | | | | | | | | | | | | | | use an inlined version of isValid() everywhere; don't detach where is non required; get rid of extra checks where possible Change-Id: I6815c1f7d7c03677d9c57dda2731ed2868ea92aa Merge-request: 1343 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/4144
* | fix typo in the docsKonstantin Ritt2011-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 1343 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> (cherry picked from commit 3926aa4b69caa9037d610b4e212d99dae86d500c) Change-Id: I5d0464651ec72d606e009cc43d0214fe179b02dd Reviewed-on: http://codereview.qt.nokia.com/4143 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | QRawFont: add missed operator !=Konstantin Ritt2011-09-022-0/+9
| | | | | | | | | | | | | | | | | | | | Merge-request: 1343 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> (cherry picked from commit 32603c5e40948491f0644d0d17a7e8bbff8d3e0c) Change-Id: I76bc558a30a61c6eabec960eb206076eb443344f Reviewed-on: http://codereview.qt.nokia.com/4142 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | optimize QGlyphRun's operator == a bitKonstantin Ritt2011-09-021-7/+11
| | | | | | | | | | | | | | | | | | | | Merge-request: 2652 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> (cherry picked from commit 56ef015b1c2384e0590f19e938d349bcffdb6961) Change-Id: Icc5fd9e8a04518d476e96d5983a95740f454f62a Reviewed-on: http://codereview.qt.nokia.com/4140 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | QGlyphRun: make operator != inlinedKonstantin Ritt2011-09-022-5/+5
| | | | | | | | | | | | | | | | | | | | Merge-request: 2652 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> (cherry picked from commit 145de5acb68f320125b7566a7d726a5a7786a5f8) Change-Id: I9d868d2258b222890c29eb26e8cd79d9fa3c7f71 Reviewed-on: http://codereview.qt.nokia.com/4139 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | QGlyphRun: don't detach if the decoration wasn't actually changedKonstantin Ritt2011-09-021-0/+9
| | | | | | | | | | | | | | | | | | | | Merge-request: 2652 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> (cherry picked from commit f550d219378e5669601de416254b3585fe3f5708) Change-Id: Ib74ae82fbeaf2b0f5eabad9568cfa9fcea09053b Reviewed-on: http://codereview.qt.nokia.com/4138 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | Fix the \since 4.x tags in gui/opengl.Samuel Rødal2011-09-024-38/+5
| | | | | | | | | | | | | | | | | | All this API is "new" since 5.0. Change-Id: I7ba1718a4a24eac00ccc4db1646200e9544ee5a4 Reviewed-on: http://codereview.qt.nokia.com/4131 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Refactor QMouseEvent to contain the position inside the windowLars Knoll2011-09-0116-59/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the default accessors for positions to localPos, windowPos and screenPos, to be explicit about their use. Introduce a QT_NO_INTEGER_EVENT_COORDINATES define so one can make sure to always use the float based coordinates. Fixup all Qt code to use the correct constructor that specifies all three coordinates. Change-Id: If4bb93b8d1e2eb2440260d99680c468706cfe68f Reviewed-on: http://codereview.qt.nokia.com/4058 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Moving relevant tests to corelib/xmlHolger Ihrig2011-09-014059-4/+6
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21066 Change-Id: I2fb68c35c7abc830ba426b0aab892332b0ca00fb Reviewed-on: http://codereview.qt.nokia.com/3734 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | Moving relevant tests to corelib/toolsHolger Ihrig2011-09-01147-46/+52
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-21066 Change-Id: I650f8f7826b9feea7c1484f06e03e10c68ec2b65 Reviewed-on: http://codereview.qt.nokia.com/3712 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* | Mac: make platformsupport a static libMorten Sorvig2011-09-015-29/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "force framework/no-framework" logic does not really work, since Qt is now a mix of frameworks and statics libs. Remove this code path and use the "detection" path instead. Also remove the exports from platformsupport. Change-Id: I0a308666480445eb47c4f443ff7529addecad10d Reviewed-on: http://codereview.qt.nokia.com/3464 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | Moving relevant tests to corelib/threadHolger Ihrig2011-09-0144-13/+16
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21066 Change-Id: Ia16fa8961f1a73f4da6709197b5dd9929c16583f Reviewed-on: http://codereview.qt.nokia.com/3663 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | Moving relevant tests to corelib/statemachineHolger Ihrig2011-09-018-3/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-21066 Change-Id: I6dfff1c3b3ad2119a588dc52eb5a2e67255284c1 Reviewed-on: http://codereview.qt.nokia.com/3658 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* | Moving relevant tests to corelib/pluginHolger Ihrig2011-09-0149-5/+8
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21066 Change-Id: I918f6ef6fb825d7cf94d6b42322b2c2eb5c52aaa Reviewed-on: http://codereview.qt.nokia.com/3604 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | Moving relevant tests to corelib/kernelHolger Ihrig2011-09-0195-32/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Test for qmetaproperty Marked QSocketNotifier Autotest as insignificant. See QTBUG-21204 Marked qtranslator Autotest as insignificant. See QTBUG-21125 Marked corelib/io/qfile/largefile as insignificant. See QTBUG-21175 Task-number: QTBUG-21066 Change-Id: I2a7f6587845c355091bb07c8dd3d1557d16db0be Reviewed-on: http://codereview.qt.nokia.com/3598 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* | Moved gui autotests into new directory structureJo Asplin2011-09-01640-74/+114
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-21133 Change-Id: I83b8f652935cf92151265ca2530a3cf81c31fdef Reviewed-on: http://codereview.qt.nokia.com/3996 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
* | Compile fix.Samuel Rødal2011-09-011-0/+2
| | | | | | | | | | | | | | | | | | | | uilib includes QtGui and QtWidgets headers, so should explicitly add gui and widgets in the .pri file. Change-Id: I5f1e80d1379cb5389287df73d6070fd8ff712a3b Reviewed-on: http://codereview.qt.nokia.com/4055 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Moved dbus autotests into new directory structureJo Asplin2011-09-0170-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-21108 Change-Id: I8cdd4af59db3716921e7392379584f349ed29136 Reviewed-on: http://codereview.qt.nokia.com/3602 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Make xcb plugin compile again.Laszlo Agocs2011-09-011-1/+1
| | | | | | | | | | | | | | | | | | The name of function handleExposeEvent has not changed. Change-Id: Ida4621bbf988088c0a75f1c93a3332702f0d92b7 Reviewed-on: http://codereview.qt.nokia.com/4037 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | Clean up shared resources immediately as the last context is destroyed.Samuel Rødal2011-09-013-12/+40
| | | | | | | | | | | | | | | | | | | | | | By not waiting until deleteLater() kicks in it's easier to auto-test. We can now add a test case for what happens when a shared resource is still valid while the last context is destroyed. Change-Id: I72963928e6a921e49ed59a79e2579b497ba37ccf Reviewed-on: http://codereview.qt.nokia.com/3732 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | The XCB plugin should not rely on QT_CONFIG=opengl anymoreGunnar Sletta2011-08-312-23/+18
| | | | | | | | | | | | | | | | Change-Id: Ieeedb7eb68704df811c613873bd2fc4b77e2aa04 Reviewed-on: http://codereview.qt.nokia.com/3966 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kevin Simons <kevin.simons@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Cocoa: Fix qmlscene flicker on startup.Morten Sorvig2011-08-317-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SG render thread was racing window creation in the GUI thread, which would cause flicker if the window won the race and was shown before the SG thread had a frame ready. Send a synchronous expose event before showing the window - this will wait for the SG render thread. In addition, don't defer NSwindow creation. The GL context setup is done before the window is shown and needs a fully created window. New API: QWindowSystemInterface::handleSynchronousExposeEvent Retire: QWindowSystemInterface::handleExposeEvent Change-Id: I0bb46089d16ec4882aaac8db67b57d15e0f51531 Reviewed-on: http://codereview.qt.nokia.com/3399 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* | Introduce Q_QTQUICK1_EXPORT fixing exports in declarative.Friedemann Kleint2011-08-311-0/+8
| | | | | | | | | | | | Change-Id: Id70c6792b5342074ef78944e7e28bd9c9b83c107 Reviewed-on: http://codereview.qt.nokia.com/3983 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Initialize member variableLars Knoll2011-08-311-1/+2
| | | | | | | | | | | | Change-Id: I165c267b87dc201ed4970d50e39ff7421cbef35f Reviewed-on: http://codereview.qt.nokia.com/3981 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Fix further test builds on Windows.Friedemann Kleint2011-08-316-6/+13
| | | | | | | | | | | | Change-Id: I9846d19c5975f4d17bed46c59272a0fa428fd0d1 Reviewed-on: http://codereview.qt.nokia.com/3980 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Compile with host architecture armv5telEskil Abrahamsen Blomfeldt2011-08-311-0/+1
| | | | | | | | | | | | Change-Id: Ied7ef4052e192d1585d7eed7a100b01f79f9773d Reviewed-on: http://codereview.qt.nokia.com/3962 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* | Fix compile on Windows.Friedemann Kleint2011-08-311-1/+1
| | | | | | | | | | | | Change-Id: I72b1c35c3f92e1198a8c888f9d732b202d84047c Reviewed-on: http://codereview.qt.nokia.com/3953 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Fix autotests to build on Windows.Friedemann Kleint2011-08-3131-158/+194
| | | | | | | | | | | | | | | | | | Basically breakage by <windows.h> being included from the OpenGL parts of <QtGui/QtGui> included from <QtTest/QtTest>. Change-Id: Id285fb89c64bf77e2408faac5688acd085579351 Reviewed-on: http://codereview.qt.nokia.com/3952 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Add a QStyleHints class to QtGuiLars Knoll2011-08-3113-107/+265
| | | | | | | | | | | | | | | | | | This class encapsulates platform specific style hints like doubleClickInterval or cursorFlashTime. Change-Id: I0d88c47a59d564d8d346642184e5b14e1864cf40 Reviewed-on: http://codereview.qt.nokia.com/3927 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Move the qmljsdebugargument variable to QGuiApplicationLars Knoll2011-08-313-8/+4
| | | | | | | | | | | | | | | | | | This used to reside in QApplication, but we need it here to remove a dependency of QtDeclarative onto widgets. Change-Id: I119fef1d51387087b00e08aff1ee4b00503a6cd5 Reviewed-on: http://codereview.qt.nokia.com/3926 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Touch event support for QWindow.Laszlo Agocs2011-08-315-2/+159
| | | | | | | | | | | | Change-Id: I83ddc48a9093856d975b25f0426db96264afeeef Reviewed-on: http://codereview.qt.nokia.com/3920 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Moving relevant tests to corelib/ioHolger Ihrig2011-08-311215-34/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Marked Test for qdiriterator as insignificant. See QTBUG-21160 Marked Test for qresourceengine as insignificant. See QTBUG-21159 Task-number: QTBUG-21066 Change-Id: I72848a651ff3e7aff1d6105dd49124e4ed070a44 Reviewed-on: http://codereview.qt.nokia.com/3577 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | Fixed hellowindow making context current in wrong thread.Samuel Rødal2011-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | Make the context a child of the Renderer, which is already moved to the correct thread. Change-Id: Iafda090e15b322c03e2c10b1905050f636b90197 Reviewed-on: http://codereview.qt.nokia.com/3915 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-3121-210/+95
|\|
| * Remove ability to run tests in random order.Jason McDonald2011-08-3112-171/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the undocumented feature that allows test functions to be executed in random order. The feature was designed to expose unintended dependencies between test functions -- test functions are only supposed to depend on the initTestCase() and init() functions. Aside from the lack of documentation, there are a number of problems with this feature. Most importantly, running the tests in random order has only a 50% chance of exposing dependencies between test functions. A better strategy would be to run the test functions in reverse order and complain if that produces different results to running the tests in the normal order. Additionally, the random order is not deterministic, so even if a dependency is exposed during a test run, there's no guarantee that it will be exposed again. The feature allows the user to optionally supply a random seed to make the "random" order deterministic, but as rand() implementations are not identical across platforms, even that does not guarantee that dependencies between test functions will be exposed deterministically. Change-Id: I39eac34c532ccb988116778bbc5ab05d835874c5 Reviewed-on: http://codereview.qt.nokia.com/3720 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Make sure tests/auto/v8.pro doesn't clobber auto.proKent Hansen2011-08-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The omission of spaces is crucial in order for the regular expressions in configure to be able to detect that v8.pro isn't a "main project" file. Task-number: QTBUG-21168 Change-Id: I2e94736ee3195bed7fd528759b1bc1812f1ae54c Reviewed-on: http://codereview.qt.nokia.com/3878 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * QSslCertificate: blacklist fraudulent *.google.comPeter Hartmann2011-08-302-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | blacklist the leaf certificate for now. There might well be more fake certificates in the wild, for that either the Diginotar.nl root cert needs to be disabled on the system or OCSP would need to be enabled (not supported by Qt yet). Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit 70f6a1b91b242174682c30be976c2aa36c450cc7) Change-Id: I7cd3fdc4c6e85202914764f983a60d301e54aa35 Reviewed-on: http://codereview.qt.nokia.com/3893 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * Compile fix on Mac OS XBradley T. Hughes2011-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | The file is called shapeitem.cpp (lowercase i), not shapeItem.cpp (with uppercase I) Change-Id: I0dd230158cf8c8323bfa779901475535e7c7d694 Reviewed-on: http://codereview.qt.nokia.com/3883 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * QHttpNetworkConnection : Fix the case when we only have one channelMartin Petersson2011-08-302-31/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For the Happy eyeballs implementation we use two channels for the case where a host lookup gives us both Ipv4 and Ipv6 addresses. In the case where the Connection is setup to only use one channel we can not use this solution, so in this case we should use the old way of connecting with one channel. Task-number: QTBUG-20981 Change-Id: I6590fb4c67d6a8261cd0e4da8f99cd3603bbb524 Reviewed-on: http://codereview.qt.nokia.com/3524 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * QHttpNetworkReply: Change dataReadProgress to qint64.Martin Petersson2011-08-303-5/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-20890 Change-Id: I36d942d26247c99eb70c035da48dc0afa6afc591 Reviewed-on: http://codereview.qt.nokia.com/3316 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* | Fix build from scratch.Friedemann Kleint2011-08-301-0/+2
| | | | | | | | | | | | Change-Id: Ifd958a51da2dbaf6afc24ef6a10f8d29e0f5f6d2 Reviewed-on: http://codereview.qt.nokia.com/3888 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | pick up the target window for a mouse event when none is specifiedGunnar Sletta2011-08-301-3/+3
| | | | | | | | | | | | | | Change-Id: Iae0402f63f39a2728b94abe68fa22592d97ea9f3 Reviewed-on: http://codereview.qt.nokia.com/3885 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* | Moving relevant tests to corelib/globalHolger Ihrig2011-08-3021-7/+10
| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21066 Change-Id: I011e601f599e11365c76598631a443b82ab9fb30 Reviewed-on: http://codereview.qt.nokia.com/3487 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | Moving relevant tests to corelib/concurrentHolger Ihrig2011-08-3033-17/+681
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding tests for QFutureSynchronizer and QtConcurrentResultStore Added minor things in QFutureSynchronizer and QtConcurrentResultStore and removed tests for destruction Task-number: QTBUG-21066 Change-Id: I9f088b89463340f339c914bcb37fb2f9d3b62057 Reviewed-on: http://codereview.qt.nokia.com/3477 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | Cocoa: Make the hellowindow opengl example work.Morten Sorvig2011-08-304-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You're not supposed to use NSOpenGLView and NSOpenGLContext at the same time - it's one or the other. Qmlscene worked because it was hitting the raster path that doesn't have a NSOpenGLView. Remove the NSOpenGLView path and m_windowSurfaceView. Change-Id: I10358851a94cd1780a312af09bbb7cf5db8f984f Reviewed-on: http://codereview.qt.nokia.com/3862 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-3040-433/+6462
|\| | | | | | | | | | | | | Conflicts: src/src.pro Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf