summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'refactor'Gunnar Sletta2011-09-138536-97780/+97052
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qws/linux-lsb-g++/qmake.conf src/gui/image/qpixmap_mac.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/text/qfontengine_qws.cpp src/gui/text/qfontengine_x11.cpp src/gui/widgets/qlinecontrol.cpp src/opengl/qgl.h src/opengl/qgl_x11egl.cpp src/plugins/plugins.pro Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
| * make a toplevel compile workGunnar Sletta2011-09-131-1/+1
| | | | | | | | | | | | | | Change-Id: I91f35e0f8a8c66fc60cad4470704f31f5b2812ab Reviewed-on: http://codereview.qt-project.org/4725 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>
| * Disabled tests for refactor->master integrationJo Asplin2011-09-1336-17/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change disables failing tests to increase the likelihood that 'make check' terminates with a zero exit status. This is done to prevent the CI system from blocking further commits once qtbase#refactor is merged into qtbase#master. Failing tests are marked as insignificant (by putting 'CONFIG += insignificant_test' in the .pro file). Note: This is a temporary measure that needs to be cleaned up once the refactor->master integration is complete. Ideally all disabled tests need to be enabled and passing. All changes will be marked by the string QTBUG-21402 in a comment for easy location. Task-number: QTBUG-21402 Change-Id: Ic4400671671f6d9b75b106a6aa4755b20e74378d Reviewed-on: http://codereview.qt-project.org/4678 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Implemented texture cache for GL paint engine in QtGui.Samuel Rødal2011-09-121-2/+8
| | | | | | | | | | | | | | | | | | | | | | This is simpler than the existing texture cache in QtOpenGL, as it only serves the GL paint engine. There's one per context group, to simplify the design and to prevent performance degradations. Change-Id: I61e3c9a444d8e246a8b38da019a56f2c0a533c0c Reviewed-on: http://codereview.qt-project.org/4674 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * Added new QOpenGLPaintDevice test case in tst_QOpenGL.Samuel Rødal2011-09-121-0/+42
| | | | | | | | | | | | | | Change-Id: Ic56e4c236f52fbd5c570bb647d5d1f4e5f9e7924 Reviewed-on: http://codereview.qt-project.org/4662 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Fixed auto-test failure in tst_QOpenGL.Samuel Rødal2011-09-121-8/+7
| | | | | | | | | | | | | | | | | | QOpenGLFramebufferObject::height() was returning the width... Change-Id: I521c2df02e00015998dc31a74481113af26e1ba6 Reviewed-on: http://codereview.qt-project.org/4663 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Disambiguated access to QTestLib APIJo Asplin2011-09-122-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 2cca7e0884a45c3a022609b2cb4efd381ee8d5a1 overloads QTestLib so that QWindow * can be passed directly to certain functions. This fix disambiguates access to the new API by selecting the QWindow * versions. This assumes that the QWidget * versions are kept mostly for backwards compatibility. Change-Id: I075196d86d8d1d38f7192dace3c3892d315bf671 Reviewed-on: http://codereview.qt-project.org/4655 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
| * Disambiguated access to QTestLib APIJo Asplin2011-09-123-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 2cca7e0884a45c3a022609b2cb4efd381ee8d5a1 overloads QTestLib so that QWindow * can be passed directly to certain functions. This fix disambiguates access to the new API by selecting the QWindow * versions. This assumes that the QWidget * versions are kept mostly for backwards compatibility. Change-Id: I8755c86d5ebeb275dfa9162b0168d9179a61982d Reviewed-on: http://codereview.qt-project.org/4640 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
| * Add other.pro back to auto.proJo Asplin2011-09-122-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The other/ subdirectory should still be built via other.pro. This was overlooked by Commit 0a208dd4135fc16d05f9fd8c417d99e3f39c39fb Task-number: QTBUG-21327 Change-Id: Ie8ebd7dfc5b1dd56ca1b629aa011d160cb563ddd Reviewed-on: http://codereview.qt-project.org/4526 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Moved autotests in category 'tools' into new directory structureJo Asplin2011-09-12369-4/+8
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-21355 Change-Id: I315d4b1f55d42391524c0e8625952dee1b96fca3 Reviewed-on: http://codereview.qt-project.org/4449 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Moved autotests in category 'testlib' into new directory structureJo Asplin2011-09-12217-3/+7
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-21353 Change-Id: I2e2ad4b7570f80b3e6500821f769e967f0a75027 Reviewed-on: http://codereview.qt-project.org/4438 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Merge branch 'master' into refactorGunnar Sletta2011-09-1210-10/+111
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/v8 src/gui/text/qfont_qpa.cpp src/gui/widgets/qlinecontrol.cpp src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp tests/auto/gui.pro tests/auto/network.pro tests/auto/qstring/tst_qstring.cpp Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
| * | Fixed build error in tst_qopenglJo Asplin2011-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLFramebufferObject must be wrapped in a QOpenGLPaintDevice before being passed to QPainter::begin(). Change-Id: Ic82f8f17b2ea18a3790de7e75f0dd6c9092528ed Reviewed-on: http://codereview.qt-project.org/4541 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Moved autotests in category 'opengl' into new directory structureJo Asplin2011-09-0914-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21356 Change-Id: I496680aa670af3409e50e1c254ef2c557b414d33 Reviewed-on: http://codereview.qt-project.org/4452 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * | Moved autotests in category 'other' into new directory structureJo Asplin2011-09-0960-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21327 Change-Id: I296063b665809e0411a7546fc9b41a287317ecb7 Reviewed-on: http://codereview.qt-project.org/4326 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * | Moved network autotests into new directory structureJo Asplin2011-09-09282-66/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21223 Change-Id: I55dbf5c42a1c5d938b9e0c9bf7d90457a6c26bbc Reviewed-on: http://codereview.qt-project.org/4259 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * | Disambiguated access to touch event API in QTestLibJo Asplin2011-09-081-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 079ec157f82f79814bd70a1f8753daa37b8d5c3f overloads the touch event API in QTestLib so that QWindow * can be passed directly to certain functions. This fix disambiguates access to the new API by selecting the QWindow * versions. This assumes that the QWidget * versions are kept mostly for backwards compatibility. Change-Id: Ib6b33edc64d81f300d4109d59fd29f25ccd605db Reviewed-on: http://codereview.qt-project.org/4443 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Added equivalent to tst_QGL::destroyFBOAfterContext() in tst_QOpenGL.Samuel Rødal2011-09-081-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | The more the merrier. Change-Id: I401ed97600a890c38cb4d5dbe0578d6bcf68e909 Reviewed-on: http://codereview.qt-project.org/4322 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| * | Fixed tst_QGL::partialGLWidgetUpdates.Samuel Rødal2011-09-071-7/+2
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ie37051e28b199b5d159f5be05be41efbd17fdf08 Reviewed-on: http://codereview.qt.nokia.com/4273 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | Fixed tst_graphicseffect auto-test failures.Samuel Rødal2011-09-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of these trigger pre-refactor as well by adding a QTest::qWait() after QTest::qWaitForWindowShown(). Change-Id: I48863fd31fc0c3b51463ed922782e86c21f05bff Reviewed-on: http://codereview.qt.nokia.com/4272 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | Merge "Merge remote branch 'gerrit/master' into HEAD" into refactorPaul Olav Tvete2011-09-0660-290/+536
| |\ \
| | * \ Merge remote branch 'gerrit/master' into HEADSamuel Rødal2011-09-0660-290/+536
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/global/qglobal.h src/gui/kernel/qplatformnativeinterface_qpa.h src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qmenu_mac.mm src/gui/widgets/qmenu_p.h src/gui/widgets/qmenubar.cpp src/gui/widgets/qmenubar_p.h src/gui/widgets/widgets.pri src/plugins/platforms/wayland/qwaylandnativeinterface.cpp src/plugins/platforms/wayland/qwaylandnativeinterface.h src/src.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp tests/auto/qstring/tst_qstring.cpp Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b
| * | | | Moved xml autotests into new directory structureJo Asplin2011-09-06802-7/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21260 Change-Id: I7bc30227d4e71e8783f274dbfa758399dca546d4 Reviewed-on: http://codereview.qt.nokia.com/4146 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * | | Moved sql autotests into new directory structureJo Asplin2011-09-0639-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21253 Change-Id: Id20605e1247b080e775968b56ea5f56462ca4c71 Reviewed-on: http://codereview.qt.nokia.com/4127 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@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>
| * | | 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>
| * | | 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>
| * | | 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>
| * | | Clean up shared resources immediately as the last context is destroyed.Samuel Rødal2011-09-011-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | 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>
| * | | 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>
| * | | 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>
| * | | Merge branch 'master' into refactorGunnar Sletta2011-08-312-2/+32
| |\ \ \
| * | | | 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>
| * | | | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-3010-14/+542
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/src.pro Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf
| * | | | | Tests: Add widgets module to profile.Friedemann Kleint2011-08-2922-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the right test macro is run. Change-Id: I84d58038f25b000c05fd52e8bda92e4484d53a6e Reviewed-on: http://codereview.qt.nokia.com/3805 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * | | | | Build on Windows/clean build on Linux.Friedemann Kleint2011-08-293-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26552e85a8e8c63002db93b7d9b645981620f0af Reviewed-on: http://codereview.qt.nokia.com/3738 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | Added qopengl auto-test.Samuel Rødal2011-08-293-0/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For testing the gui/opengl functionality. Change-Id: Ied0e977ad537c0be301bb08091adaf9cf779306b Reviewed-on: http://codereview.qt.nokia.com/3729 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | | | | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-299-1/+125
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/accessible/qaccessible.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_mac.mm src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qapplication_s60.cpp src/gui/kernel/qapplication_win.cpp src/gui/kernel/qapplication_x11.cpp src/gui/kernel/qdnd_x11.cpp src/gui/kernel/qwidget.cpp src/gui/widgets/qlabel.cpp Change-Id: Ief9c75724d2cff89ed45f009bdee2ffc5e4395ba
| * | | | | | test: removed obsolete tst_maketestselftest::tests_auto_proRohan McGovern2011-08-291-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test attempted to ensure that tests/auto/auto.pro would only refer to other .pro files, attempting to guarantee that the set of all tests could be cleanly broken up. The purpose of this was to enable CI optimizations (e.g. running the autotests for different modules on different machines in parallel). This test is invalidated by pending commits which rearrange the autotests, and we never made use of this property for optimization anyway, so drop this part of the test. Change-Id: I23e712fb8ec1dbe7ac65fe66015e1f060f3dcd41 Reviewed-on: http://codereview.qt.nokia.com/3681 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
| * | | | | | QWindow::mapToGlobal/mapFromGlobal and move()Gunnar Sletta2011-08-292-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1909b9ce468a8708cb25d5a2fbe8ebd90bd958a Reviewed-on: http://codereview.qt.nokia.com/3702 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | | Moving relevant tests to corelib/codecsHolger Ihrig2011-08-2613-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21066 Change-Id: If33bda9622bbfdac2b72ec2bf8489b0f62bae6e2 Reviewed-on: http://codereview.qt.nokia.com/3469 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>