summaryrefslogtreecommitdiffstats
path: root/src/testlib
Commit message (Collapse)AuthorAgeFilesLines
* Make QTest::newRow a bit more verbose if a data tag is null.Jędrzej Nowacki2011-11-161-0/+1
| | | | | | | | | | Currently QTest::newRow function expects to have correct tag string for each test data. This was enforced by a simple assert. By adding a an assert with message we might simplify debugging of a test that generates test cases. Change-Id: I84ebb397264c99e7bb46d281fd38583dd2d6964c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Integrate testcocoon support into Qt build system.Rohan McGovern2011-11-151-0/+33
| | | | | | | | | | | | To instrument a Qt application or library with the TestCocoon coverage tool, do `CONFIG+=testcocoon' in the application .pro file. To instrument Qt itself with testcocoon, use the `-testcocoon' configure option. Change-Id: Ie77109a078d11ea51f7a073621e0df9c752c44ae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make QTest::qWait() handle DeferredDelete eventCharles Yin2011-11-151-0/+2
| | | | | | | | | | | The QTest::qWait() function does not handle DeferredDelete, in this case all deleteLater() calls before the qWait() won't be processed during the wait. Add an explicit sendPostedEvents(0, QEvent::DeferredDelete) to fix this problem. Task-number:QTBUG-22633 Change-Id: I2c5574b4e7d3c070fad6382dc36ddfd1dfac50d6 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Propagate QTest::mouseEvent keyboard modifiers.Andrew den Exter2011-11-101-7/+7
| | | | | | | | | The QWindowSystemInterface mouse functions now have keyboard modifiers parameter, make use of them. Task-number: QTBUG-21743 Change-Id: I65ba1095825b81d575d314c1de2a45cef28e697a Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Prevent timestamps in widgets' touch events from disappearingLaszlo Agocs2011-11-041-2/+3
| | | | | Change-Id: I096914eb2b02ad9c4a5c0462a1f4b76ef17c3957 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Added -datatags option to QTestLibJo Asplin2011-11-043-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Note: This feature is ported from Qt 4.8. See the following commits: 01575deafb7d26ca2431374e92c6d71de96547c7 4866d1ba8afbab61e102942d1ea93b81fea053d6 ) Passing the -datatags option to a QTestLib program prints the available data tags to standard output. For completeness, the test case name is also printed at the start of each output line. (Although the file name is supposed to match the lower-case version of the test case name, this is currently not true in all cases (particularly not under tests/benchmarks/). Even if there was a script to enforce this convention, the -datatags option provides this information in a reliable way.) Data tags for each test function (f() in this case) are printed in four different ways depending on the presence of local and global data tags: Case 1: No tags: tst_MyTestCasetst_MyTestCase f Case 2: Local tags only: tst_MyTestCase f local tag 1 tst_MyTestCase f local tag 2 ... Case 3: Global tags only: tst_MyTestCase f __global__ global tag 1 tst_MyTestCase f __global__ global tag 2 ... Case 4: Local and global tags: tst_MyTestCase f local tag 1 __global__ global tag 1 tst_MyTestCase f local tag 2 __global__ global tag 1 ... tst_MyTestCase f local tag 1 __global__ global tag 2 tst_MyTestCase f local tag 2 __global__ global tag 2 ... ... Note that the string __global__ is assumed to be highly unlikely to occur in a data tag (if it does, an ambiguity results). Change-Id: Ib51aa0c3c32ad52e52ce519729292cf8f0ec5d50 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Fix getting of enviroment strings in testlibJason McDonald2011-11-031-5/+5
| | | | | | | | | | | | | | | | | | | The standard C getenv() returns NULL if the requested environment variable is not found. In Qt4 and later, qgetenv() does not return a null pointer if the requested environment string is not defined. Instead it returns a QByteArray containing an empty string. If using qgetenv(), there is no way to tell the difference between an undefined environment variable and one which is defined to be the empty string. In testlib, all calls to qgetenv() were checking whether the returned QByteArray's constData() returned a null pointer, but that would never happen. These calls must instead check whether the QByteArray contains a non-empty string. Change-Id: I342f0e8b196896c26cccce3ff169fa1b9669b5ff Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Testlib: Remove remains of qpa.Friedemann Kleint2011-11-021-4/+4
| | | | | | | | Link ApplicationServices in the non-qpa case (CoreServices present). Change-Id: I7555243aa480a7a4db84731a797924a97bf200cd Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Correctly handle null windows or widgets in keyClick()Lars Knoll2011-10-311-0/+11
| | | | | | | | | | Allow passing of null windows or widgets to keyClick(). In that case route the event through the normal Qt event processing. This allows e.g. shortcuts to catch the key event. Change-Id: Ic9455ea9be5164918b1c0bccbd58dd32eae74ff1 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update qmltest usage helpCharles Yin2011-10-281-2/+3
| | | | | | | | Add "-translation" command line option Task-number:QTBUG-22390 Change-Id: I0600b92767b73ccb54e8d70f6c7bb8bf8075c81c Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Fix compiler warnings.Friedemann Kleint2011-10-271-2/+2
| | | | | | | | - Fix gcc 4.6.X warnings about assigned but unused variables - Remove trailing ';' from inline functions (Clang) Change-Id: I8670afd6b149748a740f22c65de137762e9f18e1 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Allow commiting and then reusing a QTouchEventSequence for testing.Michael Brasser2011-10-241-20/+33
| | | | | | | | | | | | | This method allows calls to stationary() to automatically remember the previous position for a given touch point id. Example usage: QTouchEventSequence sequence = QTest::touchEvent(&window); sequence.press(0, QPoint(10,10)).commit(); sequence.stationary(0).press(1, QPoint(40,10)).commit(); Task-number: QTBUG-22057 Change-Id: I489ab3d61f4637d2ed97d09ed0854afa814407a1 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove legacy Symbian code from qtestlib.Jason McDonald2011-10-246-71/+8
| | | | | Change-Id: Ia4ac52ce0b5f5a4ba1fcd6594daf424fd7208777 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make some qtestlib headers private.Jason McDonald2011-10-2312-30/+92
| | | | | | | | | These headers should have been private from Day One. Make them private now so that nobody will be tempted to use them outside testlib in the future. Change-Id: I5361777ade124d8187176f9af3cc79cd1a8ecb4f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Testlib: Fixed compilation with MSVC.Friedemann Kleint2011-10-211-0/+9
| | | | | | | MSVC does not like VA_ARGS tricks. Change-Id: I947dcb89e519c18a482a504725213a3f4d9670ff Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Make testlib use #include consistently.Jason McDonald2011-10-2122-85/+81
| | | | | Change-Id: I36b5da3f832d2588072405d93143173edc29f4af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix misleading comment on test execution order.Jason McDonald2011-10-211-1/+1
| | | | | | | | | When executing a data-driven test, testlib executes the _data function once, then repeatedly executes init(), then the test function, then cleanup() for each row of test data. Change-Id: Icfa1dd19a52fb1debbc92b7cbe13d85bfb0418c7 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update QSKIP documentation.Jason McDonald2011-10-211-9/+17
| | | | | | | Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I3d4cf8e11756b92fe9d97f01a02c61cbf2df1556 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove QTest::SkipMode from qtestlib API.Jason McDonald2011-10-213-41/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the SkipAll mode is used, tests only report a SKIP for the first line of test data and subsequent lines are not reported at all. This behaviour makes it impossible for anything post-processing test results to accurately report test pass- and run- rates because they cannot see how many lines of test data were skipped. This commit removes SkipMode. QSKIPs in regular test functions and data functions are treated the same as SkipSingle, so that every skipped line of local or global test data is reported in the test log. QSKIPs elsewhere are treated the same as SkipAll -- skipping in init() causes the next test function to be skipped entirely, and skipping in initTestCase() or initTestCase_data() causes all test functions to be skipped. This commit only changes qtestlib and the selftests. A further commit will change the autotests to remove the SkipMode parameter from QSKIP calls. Note that the change in expected output for the globaldata selftest is deliberate, as the QSKIP in the skipLocal test function has effectively changed from SkipAll to SkipSingle. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I7b1c53fe7ca9dde032810b789d967e2a402bbe5d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alex <alex.blasche@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>
* Rename QMetaType::construct() to create()Kent Hansen2011-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | create() is symmetric with destroy(). Also rename the internal methods and fields to be consistent (qDeleteHelper already had the "right" name, though!). This change will allow us to use construct() and destruct() for something else: Placement new-style allocation (QTBUG-12574). The old construct() is still kept for now, until the other repositories have been updated to use create(). Change-Id: Iceb184af6cffcb0a634359cfc3516c718ba0c2f5 Reviewed-on: http://codereview.qt-project.org/6342 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Clean-up a macro for CocoaMorten Sorvig2011-10-102-14/+4
| | | | | | | | | Remove the usage of Q_MAC_USE_COCOA and Carbon code paths. Change-Id: Ib569ad8c6d9ffe258f454b3c3b06e95294a10112 Reviewed-on: http://codereview.qt-project.org/5100 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Sanity-Review: Morten Johan Sørvig <morten.sorvig@nokia.com>
* update QmlTest option usage helpCharles Yin2011-10-101-1/+1
| | | | | | | Change-Id: I8ccd49bcaac126af2bad2382d481857f1e48c18b Reviewed-on: http://codereview.qt-project.org/6274 Reviewed-by: Charles Yin <charles.yin@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Add QTest::keyRelease() accepting a Qt::Key valueMartin Jones2011-10-061-0/+2
| | | | | | | Change-Id: Id7943820a71472ab1e3c81ea76701738d7600815 Reviewed-on: http://codereview.qt-project.org/6085 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Declarative: Fix linking of the testlib plugin (Windows).Friedemann Kleint2011-10-041-1/+1
| | | | | | | | | | | | | qtdeclarative/src/imports/testlib uses the exported variable QTest::printAvailableFunctions. As it is a plugin, it has only QT_DLL defined and not QT_SHARED and thus sees Q_TESTLIB_EXPORT=''. Change-Id: I34646e920a812fb907b60e0c4c9399499d689a01 Reviewed-on: http://codereview.qt-project.org/5990 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* testlib: Fix header guard filesSergio Ahumada2011-10-044-8/+8
| | | | | | | Change-Id: Ia33423f9bd3f85259da908706d73cc2da4d8964d Reviewed-on: http://codereview.qt-project.org/5937 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Make all uses of QBasicAtomicInt and Pointer use load() and store()Thiago Macieira2011-10-031-1/+1
| | | | | | | | | | | | | | Most of these changes are search-and-replace of d->ref ==, d->ref != and d->ref =. The QBasicAtomicPointer in QObjectPrivate::Connection didn't need to be basic, so I made it QAtomicPointer. Change-Id: Ie3271abd1728af599f9ab17c6f4868e475f17bb6 Reviewed-on: http://codereview.qt-project.org/5030 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* add a latency after simulating keyevets since they are queued upGunnar Sletta2011-10-031-0/+5
| | | | | | | | Change-Id: Iaaaf01ab464cb2d310ed738de85ffdecd6cd854f Reviewed-on: http://codereview.qt-project.org/5770 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Refactor accessibility for Qt5Jan-Arve Saether2011-09-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | * Moved most stuff to gui\accessible * Moved widget-specific stuff to widgets\accessible * Moved platform-specific code to either the bridge plugin (this was already the case) or to the platform plugin. * Added several classes and functions. These have not yet gone through an API review. The plan is to do that in a later commit. Classes: - QPlatformAccessibility - QWindowsAccessibility Functions: - QWindow *QAccessibleInterface::window(); - QPlatformAccessibility *QPlatformIntegration::accessibility() * The bridge code can now either be a plugin or integrated into the platform plugin * Mac accessibility is left out for now. Unix "should still work" (tm). These platforms should be fixed soon. Change-Id: Ib49ffa73b647ee0af90864544c2769440157f562 Reviewed-on: http://codereview.qt-project.org/5330 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Make QTest::qWarn() use __FILE__ and __LINE__.Jason McDonald2011-09-284-7/+7
| | | | | | | | | | This change makes QTest::qWarn() consistent with similar testlib functions, which take __FILE__ and __LINE__. Change-Id: I12977cb30672899ab38877b4a656f0cc0c7ea02c Reviewed-on: http://codereview.qt-project.org/3559 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Implement QTEST_GUILESS_MAINJan Kundrát2011-09-262-1/+25
| | | | | | | | | | | | Add support for test cases which require an event loop, but do not need GUI up and running. Such cases are best accommodated by code similar to QTEST_MAIN, but using QCoreApplication instead of QApplication. Change-Id: I04ce82d26b80a4edeba6bf7604a7f8d974232a11 Merge-request: 919 Reviewed-on: http://codereview.qt-project.org/5427 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Allow tests to log to multiple destinationsJason McDonald2011-09-233-64/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each destination and the format of output to write there is specified by adding "-o filename,format" to the command-line. The special filename "-" indicates that the log output is written to the standard output stream, though standard output can be used as a destination at most once. The old-style testlib output options are still supported, but can only be used to specify one logging destination, as before. If no logging options are given on the command-line, a plain text log will go to the console, as before. To log to the console in plain text and to the file "test_output" in xunit format, one would invoke a test in the following way: tst_foo -o test_output,xunitxml -o -,txt This commit also enhances the selftests to test with multiple loggers, but negative tests (e.g. bad combinations of command-line options) are left for future task QTBUG-21567. Task-number: QTBUG-20615 Change-Id: If91e752bc7001657e15e427aba9d25ab0a29a0b0 Reviewed-on: http://codereview.qt-project.org/4125 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* testlib: Separate the gui- and widgets-specific apiKent Hansen2011-09-213-174/+159
| | | | | | | | | | | | Group the widgets-specific ("legacy") api under as few ifdefs as possible. (The diff can look confusing; rest assured that this change "only" moves entire functions around in the files.) Change-Id: I27bdec7d1c96d0b040dc22a8fed17e4e47766276 Reviewed-on: http://codereview.qt-project.org/5290 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
* Remove testlib's dependency on gui and widgetsKent Hansen2011-09-211-1/+1
| | | | | | | | | | | | | | Commit 37d76a679878d7c07f8a2cb17f7bda46f6582572 made testlib depend on gui and widgets. It shouldn't. Changing the includes was enough. It's the application (e.g. autotest) that uses the gui/widgets features that should link against gui/widgets. Change-Id: If80d30a7eca2cac78cb5c6e5d29c82a06fb9f1dd Reviewed-on: http://codereview.qt-project.org/5095 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jo Asplin <jo.asplin@nokia.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
* testlib: Remove widgets dependency when only using guiKent Hansen2011-09-215-1/+53
| | | | | | | | | | | There's api in testlib that should only be available if the application links against widgets. Change-Id: I22e382c6710690866ed8ffed81bae27b548dc830 Reviewed-on: http://codereview.qt-project.org/5094 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jo Asplin <jo.asplin@nokia.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
* Initialize in the right orderGunnar Sletta2011-09-191-2/+2
| | | | | | | Change-Id: I605c92bb43ea304cc812f85dc9937c161b2279f6 Reviewed-on: http://codereview.qt-project.org/5120 Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Remove gui-related ifdef from testlib/qbenchmark.cppKent Hansen2011-09-191-4/+0
| | | | | | | | | | It didn't make sense, since testlib doesn't link against gui. The QApplication api wasn't used anywhere anyway. Change-Id: Idb1bd20c7bcd0f9f16a9b526a7dabe4afccecfc4 Reviewed-on: http://codereview.qt-project.org/5058 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* correctly initialise private data in QTouchEventSequence constructorMatthew Cattell2011-09-171-2/+2
| | | | | | | Change-Id: Ia43ab0af4dfbaa824e76f744030e98f29e898bac Reviewed-on: http://codereview.qt-project.org/4973 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
* compile when shadowing is an errorGunnar Sletta2011-09-151-7/+7
| | | | | | | Change-Id: If12cd19821d07303e808e19be1ee3984c90110b1 Reviewed-on: http://codereview.qt-project.org/4946 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* added small delay after touch event is dispatchedMatthew Cattell2011-09-141-0/+1
| | | | Change-Id: Ic5682ac32e9518a293f31cd4480df061a8215746
* hack to allow qWaitForWindowShown to be used in test cases that use QWindowMatthew Cattell2011-09-121-0/+7
| | | | | | | Change-Id: Id51aaf81d898f9159e4587613f5e34c3de9a5808 Reviewed-on: http://codereview.qt-project.org/4690 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* added ascii translations to qasciikey for keyup and keydownMatthew Cattell2011-09-122-1/+2
| | | | | | | Change-Id: I7645392b437bdaa5e981dbf07cac70ee1653b624 Reviewed-on: http://codereview.qt-project.org/4689 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* added additional qwindow test support functions for keyboard and mouse eventsMatthew Cattell2011-09-092-1/+85
| | | | | | Change-Id: Id5be7053c917bcefb2bb8cfab58de0933baf15d3 Reviewed-on: http://codereview.qt-project.org/4540 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* fixed mouseMoveMatthew Cattell2011-09-081-5/+11
| | | | | | Change-Id: I95dd22ed3216f5ad169393f535e27b1b397c8433 Reviewed-on: http://codereview.qt-project.org/4462 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* add support for QWindow in mouseEventMatthew Cattell2011-09-061-1/+70
| | | | | | | Change-Id: I0cbc2f2e6f4753da44a7709b31cf0e228def628c Reviewed-on: http://codereview.qt.nokia.com/4271 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* added support for qwindowMatthew Cattell2011-09-061-3/+72
| | | | | | Change-Id: I5611a5d3590be596457dcad5e431ae110c2c8b47 Reviewed-on: http://codereview.qt.nokia.com/4258 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Merge remote branch 'gerrit/master' into HEADSamuel Rødal2011-09-0635-1126/+296
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Pass log file name when constructing loggers.Jason McDonald2011-09-0511-79/+75
| | | | | | | | | | | | | | | | | | | | | | Pass the filename when creating the logger rather than when commencing output. This will simplify forthcoming changes for running multiple loggers. Change-Id: I563aa97661caf279a5dcccb1321ff3ce4725b332 Reviewed-on: http://codereview.qt.nokia.com/4116 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 12:57:06 +0000