summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Fix delayed password masking mid-string.Andrew den Exter2011-09-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | Unmask the last character typed, not the last character in the string. Change-Id: I9c70d2347bf878c18ab0a7f4ea76f755ca19a85c Task-number: QTBUG-17003 Reviewed-by: Alan Alpert (cherry picked from commit b98e9e69dd8ba33d5f01b9518d95b63b86c4b443) Reviewed-on: http://codereview.qt.nokia.com/4165 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Restore Qt4.7 behaviour of QFileInfo::absolute(File)PathShane Kearns2011-09-021-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many applications relied on the undefined behaviour that the filesystem engines returned clean paths (despite the documentation stating that they may not), and consequently suffered regressions with Qt 4.8. Unix paths are once again cleaned if necessary. Windows/Symbian paths were already cleaned, but now use the utility function to check if a path is dirty, to avoid duplicated code. Task-number: QTBUG-19995 Change-Id: If8c18469f149291c9d079ae3da23bc2087bbd49a Reviewed-on: http://codereview.qt.nokia.com/4154 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
| * Fix compile error on MSVC2008Shane Kearns2011-09-021-1/+1
| | | | | | | | | | | | | | Change-Id: I4f6192b9db601076688b52bfd794ea80a7346729 Reviewed-on: http://codereview.qt.nokia.com/4153 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
| * Remove the build-key from the plugin verification dataBradley T. Hughes2011-09-022-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build-key is an old mechanism to work around binary incompatibilities in GCC 3.x versions. Modern GCC has not broken binary compatibility since 3.4, making this mechanism obsolete. The cache value stored now only includes Qt version, the debug/release boolean, and the last modified time for the plugin. Old 4-value keys will be replaced with new keys as the plugins are reloaded the first time. This also removes QLibraryInfo::buildKey(), which is a source-incompatible change. The UNIX and Windows configure tools have been updated to stop outputting the QT_BUILD_KEY preprocessor directive. See also: http://lists.qt.nokia.com/pipermail/qt5-feedback/2011-August/000892.html Change-Id: I7d06969a370d3d2c6de413c1230d9d6789cbf195 Reviewed-on: http://codereview.qt.nokia.com/3977 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| * Fix comparison of absolute, unclean paths in QDirShane Kearns2011-09-022-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QDir::operator== was creating a clean absolute path for comparison purposes if the original path was relative. However original absolute paths were trusted, even though they could be unclean. Now they are checked for cleanliness first. Task-Number: QTBUG-19995 Task-Number: QTBUG-20495 Change-Id: I047a1a40ae5151e4604085e4ac87f30a4e4979c4 Reviewed-on: http://codereview.qt.nokia.com/4099 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
| * qssl: add auto test to QSsl::Opaque QSslKeysCorentin Chary2011-09-022-0/+41
| | | | | | | | | | | | | | | | | | | | | | Also export two symbols for auto tests since opaque keys need EVP_PKEY * created by openssl. Change-Id: Ib7801ddfceb259de7291bfaa5940df87f68af97d Merge-request: 48 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/4011 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * test: removed bogus CONFIG+=debug in qdiriterator benchmarkRohan McGovern2011-09-011-2/+0
| | | | | | | | | | | | | | | | | | | | This doesn't make sense, none of the other benchmarks do it, and it breaks compilation for a release-only mac build. Change-Id: I3bc73f670688d413afcae7fa88bab19f7b3dac33 Reviewed-on: http://codereview.qt.nokia.com/4017 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * test: removed bogus CONFIG+=debug for badxml selftestRohan McGovern2011-09-011-1/+0
| | | | | | | | | | | | | | | | | | | | This appears to serve no purpose. It was probably copy-pasted from assert.pro. Change-Id: Ie3d9605b969ee11f2d64c1ac3e480e9efb862a3c Reviewed-on: http://codereview.qt.nokia.com/4016 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * test: fixed `assert' selftest for release-only mac buildsRohan McGovern2011-09-012-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test intentionally crashes itself by using Q_ASSERT. Since Q_ASSERT is a no-op in release builds, the .pro file was attempting to always force debug mode for this project. However, on platforms where debug vs release affect linkage (e.g. mac and windows), this is invalid. On these platforms, debug mode can't be enabled unless debug versions of the Qt libraries are available, which they are not if Qt is configured with `-no-debug-and-release -release'. Use a different method to ensure that Q_ASSERT really asserts, for both debug and release builds. Change-Id: I13eea2c72c77a0a981850dbcaa77f65f147c8490 Reviewed-on: http://codereview.qt.nokia.com/4015 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * Add option to compare to different platform in lancelot autotestaavit2011-09-018-74/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit b6b160d9ba1e0a5f1fbd67112f8c78ba48e7cad7) Conflicts: tests/baselineserver/src/baselineserver.cpp Change-Id: Ie8bdff26b8394bb6a5b6b48225b20833dbee0637 Reviewed-on: http://codereview.qt.nokia.com/4082 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Simplify qtestlib logging code, part 1Jason McDonald2011-09-011-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both the old and new XML loggers produce the Complete and Light XML log formats, while only the new logger produces Xunit XML logs. The disadvantage of the new logger is that it is more complex and doesn't produce a partial log if the test fails to terminate gracefully. This behaviour arises because Xunit format output cannot be written correctly until all tests have been executed. This commit removes the Complete and Light XML formats from the new logger, using the old logger to produce those formats and the new logger to produce only Xunit XML. Prior to this commit, the qtestlib selftests demonstrate that the old and new loggers produce identical output for Complete and Light XML. This commit also removes the undocumented -flush command-line option, which was used rather obscurely to select between the old and new loggers. The newer logger will be renamed to QXunitTestLogger in a subsequent commit. Change-Id: Id304f5b411bdd520409ee233f6bc34e8917942ab Reviewed-on: http://codereview.qt.nokia.com/3923 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Remove XFAIL from selftests for some platformsJason McDonald2011-08-315-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The selftest for assert messages calls QEXPECT_FAIL if the assert message doesn't exactly match the expected output. This is because Q_ASSERT uses __FILE__, which is compiler-dependant. The expected output for this test contains various hard-coded unix paths meaning that the test never passes on any platform. This commit removes those paths from the test data so that the test passes for compilers that don't put path information in __FILE__. This commit also makes the XFAIL message more accurate -- absolute paths in assert messages don't come from QTestLib, they come from Q_ASSERT's use of __FILE__. Change-Id: I9aae212379b43a29ae83715717cc978b4b619420 Reviewed-on: http://codereview.qt.nokia.com/3908 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Add QLocale::toUpper/LowerLars Knoll2011-08-311-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toUpper/Lower() methods in QString should not be locale dependent, as this can lead to rather hard to find bugs in at least a turkish locale. Rather have explicit, locale dependend case conversions available in QLocale. Reviewed-by: Denis Dzyubenko (cherry picked from commit da0e1e101bb4c44c25b6523357fa81ad1b2d6539) Change-Id: I1cc3f341bef17ad573a736dc94c9c5d514ace54e Reviewed-on: http://codereview.qt.nokia.com/3259 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * QSslCertificate: regenerate blacklisted certificates, they were expiredPeter Hartmann2011-08-319-90/+90
| | | | | | | | | | | | | | | | | | | | | | regenerating blacklisted certificates with same serial number and common name, but longer validity: Now they are valid for 10 years. (cherry picked from commit a3d22777028b102b7f65cf2db9719f5d57308b04) Change-Id: I7884484c2f61b3a55f671faa38967e62fc8954f0 Reviewed-on: http://codereview.qt.nokia.com/3894 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
| * Fix errors in lightxml test loggerJason McDonald2011-08-3117-40/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newer test logger did not produce the same light XML output as the logger that it replaced. In particular, it did not output the <DataTag> tag and it incorrectly nested a <Message> tag inside the <Incident> tag when a fatal error occured in a test. Unfortunately, it appears that the expected lightxml output for the selftests was produced by running tests using the newer logger, while the selftests did not use the older lightxml logger. Thus the errors were not detected by the selftests. This commit adds the older lightxml logger to the selftests, updates the expected test data accordingly, and modifies the newer lightxml logger to behave correctly. This last item is achieved by making the lightxml streamer copy most of the code from the xml streamer -- lightxml output is supposed to be same as xml, except for the omission of the root and <TestCase> tags. Change-Id: Ie6e1f69dd6000df2b9d0c5c8e2109fe7bbff3956 Reviewed-on: http://codereview.qt.nokia.com/3902 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Make lightxml and xml log formatting consistentJason McDonald2011-08-3128-62/+62
| | | | | | | | | | | | | | | | | | | | | | For XML logs, an Incident tag with no sub-tags has a space before the closing slash. For Light XML logs, this space was missing unless the -flush command line option was supplied. Change-Id: I6de2e140f9309f333b5b97ed7f8116e4e727a149 Reviewed-on: http://codereview.qt.nokia.com/3871 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@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
|\|
| * 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-301-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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
| * Add QtV8 library to QtBaseKent Hansen2011-08-299-0/+448
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds Aaron's copy of V8 to src/3rdparty/v8 (as a git submodule), and builds it as a "normal" Qt library (without any dependencies on Qt itself). The library can be added to a project with QT += v8-private V8 API headers are available as private includes, e.g. #include <private/v8.h> The API is private because we're exposing a third-party API directly, and we don't want to (and cannot) make source or binary compatibility guarantees for it. Since we want the V8 public API headers to be private headers in Qt, syncqt and sync.profile were extended to understand a new configuration option, the @allmoduleheadersprivate array, that tells syncqt whether all the library headers should be treated as private even though they don't follow the _p.h Qt convention. The V8 project files, patches and autotests are copied from the QtDeclarative repository. The next step after this commit is to remove QtDeclarative's copy of V8 and link with QtV8 instead. Task-number: QTBUG-20963 Change-Id: Ib8820362cdbc8fa662a5e97db841656cf38d1b62 Reviewed-on: http://codereview.qt.nokia.com/3092 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Optimized QMatrix4x4 by improving how 'flagBits' are used.Kim Motoyoshi Kalland2011-08-291-14/+94
| | | | | | | | | | | | | | Change-Id: Ic417336489d334e25b547c719d457faf65307cac Reviewed-on: http://codereview.qt.nokia.com/3670 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | 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: marked tst_qfiledialog as insignificant for qpa, xcbRohan McGovern2011-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | This autotest sometimes passes and sometimes fails. Task-number: QTBUG-21109 Change-Id: I160b43a1abd0de7350029f2eb758f177e880d38d Reviewed-on: http://codereview.qt.nokia.com/3575 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| * test: marked tst_qmenu as insignificant (for qpa, xcb)Rohan McGovern2011-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | This autotest sometimes fails and sometimes passes. Task-number: QTBUG-21100 Change-Id: I5b3a1cb9713cc12ead130b4c64a876397d61fe17 Reviewed-on: http://codereview.qt.nokia.com/3549 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| * test: marked tst_qlistwidget as insignificantRohan McGovern2011-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | This test sometimes passes and sometimes fails. Task-number: QTBUG-21098 Change-Id: Ic56e93d12a7b3fa2e9c135e25610bf1119fa636e Reviewed-on: http://codereview.qt.nokia.com/3548 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
| * Mark QNetworkReply test as unstableEskil Abrahamsen Blomfeldt2011-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | QTBUG-21102 is currently blocking integration of several commits. Marking the test as unstable until the bug has been fixed. Change-Id: I9b630767fd1aa4369564f5e90c63e850808385e1 Reviewed-on: http://codereview.qt.nokia.com/3584 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
| * Make the DBus timeout configurable in QDBusAbstractInterface.David Faure2011-08-255-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1253 Reviewed-by: Thiago Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> (cherry picked from commit e58a402fbee2fc8af8cd651acafdc28525ed1314) Change-Id: I4246047b149193e510f2984a0b1a1fae655b9a51 Reviewed-on: http://codereview.qt.nokia.com/3580 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 13:09:44 +0000