summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Move printing into it's own libraryLars Knoll2011-08-192-2/+2
| | | | | | | | | | | | Create a libQtPrintSupport library that contains our current printing infrastructure. Long term this will get replaced with a libQtPrint, as the current architecture is not really maintainable. Change-Id: I7362fff6786b58c5b4e9213c23eda36d15048aa2 Reviewed-on: http://codereview.qt.nokia.com/3209 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix typo in qapplication testOlli Werwolff2011-08-151-1/+1
| | | | | | | Change-Id: I84f1257e3483a629ea8cfca041710bdbfbd8f3ba Reviewed-on: http://codereview.qt.nokia.com/2963 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* compile fix for compiling without sslJørgen Lind2011-08-041-4/+8
| | | | | | | Change-Id: I48942dd437f9475c8584d5aef176f71464ae86be Reviewed-on: http://codereview.qt.nokia.com/2598 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-0349-398/+965
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlinecontrol_p.h src/gui/widgets/qtabwidget.h Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
| * Fix QString/QByteArray literals for MSVC2010 (compilation of tests).Friedemann Kleint2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | - Specify return type of QByteArrayLiteral/QStringLiteral lambdas. - Define QT_UNICODE_LITERAL instead of QT_UNICODE_MARKER. Change-Id: I8a53506887d2736b093798220b088f645f05e415 Reviewed-on: http://codereview.qt.nokia.com/2514 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| * test: mark tst_qtconcurrentfilter as insignificant on LinuxRohan McGovern2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | This test fails pseudorandomly, which makes the result insignificant for the purpose of detecting regressions. Task-number: QTBUG-20688 Change-Id: I3274953841a553e35b4eb844702868f2f9ec0525 Reviewed-on: http://codereview.qt.nokia.com/2491 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| * test: mark tst_qabstractnetworkcache as insignificantRohan McGovern2011-08-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | This test crashes pseudorandomly, which makes the result insignificant for the purpose of detecting regressions. Task-number: QTBUG-20686 Change-Id: I3079d935d46a4bcd2b119c2b9b452f0b69dccf21 Reviewed-on: http://codereview.qt.nokia.com/2479 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| * Make failure messages from tst_QSslCertificate::verify much more usefulRohan McGovern2011-08-021-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the failure message from the previously brief: '(errors.count() == 0)' returned FALSE. To the vastly more useful: '(errors.count() == 0)' returned FALSE. (errors: [ "The certificate has expired" ]) Change-Id: I587cd8ddfd3c17e273220bc95691b3dc92390547 Reviewed-on: http://codereview.qt.nokia.com/2241 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * test: skip some tst_qtextscriptengine tests when fonts are missingRohan McGovern2011-08-022-5/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This autotest may fail depending on the version of fonts which are installed on the system. It has no way to verify if the correct fonts are installed, and it's unclear from where the correct version of the fonts may be obtained. Therefore, disable the test by default unless the user has indicated that they have a correct setup by setting QT_HAVE_TEST_FONTS=1. Task-number: QTBUG-20682 Change-Id: I24174520f54af6a9b2c13c9c1347f46555bce3d4 Reviewed-on: http://codereview.qt.nokia.com/2469 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * test: remove CONFIG+=insignificant_test for tst_qgraphicstransformRohan McGovern2011-08-022-8/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This autotest failure is stable, so it should be marked with QEXPECT_FAIL, not CONFIG+=insignificant_test. Note that the test row naming had to be changed, as the test previously created many rows of testdata with the same name, making it impossible to skip only the broken rows. Task-number: QTBUG-20661 Change-Id: Ie38f5dddafe7686e30eaa8ff3445310935d2cd9a Reviewed-on: http://codereview.qt.nokia.com/2419 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * test: fixed failure of tst_qiconRohan McGovern2011-08-022-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | This test unconditionally assumed that SVG support was available. This is an invalid circular dependency: the test is in qtbase and depends on qtsvg, which depends on qtbase. Change the test so that it uses SVG support only if available. Change-Id: Ia63ce74abdecd4bcf7a4e0714b8cb7c488e17495 Reviewed-on: http://codereview.qt.nokia.com/2426 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| * test: fixed crash of tst_qdialog and removed CONFIG+=insignificant_testRohan McGovern2011-08-022-3/+16
| | | | | | | | | | | | | | | | | | | | | | This test assumed that C++ exceptions could always be caught by the event loop. This is not the case when the Glib event loop is used. Skip the relevant portion of the test in that case. Change-Id: I6a6325c3590c810a5aba28ec98279581dcfaf55c Reviewed-on: http://codereview.qt.nokia.com/2455 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| * test: improved stability of tst_qiodevice on slow machinesRohan McGovern2011-08-021-4/+4
| | | | | | | | | | | | | | | | | | Increased network timeout from 5 to 30 seconds. Change-Id: I4751dbfbb82c2091f1cec26150f06f913ffbe4c0 Reviewed-on: http://codereview.qt.nokia.com/2456 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| * test: fixed tst_qimagereader and removed CONFIG+=insignificant_testRohan McGovern2011-08-022-180/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test assumed that Qt's available image formats could be determined at compile time. This was never correct since the image formats are loaded from plugins at runtime; in Qt5 it became a real problem since one image format (svg) was moved out of qtbase into a separate module, turning this into a circular dependency: this test in qtbase depends on qtsvg, which depends on qtbase. Always check the image formats at runtime instead. Change-Id: I5e770c5b11276c39910e34f232a2fea0a7abaa8c Reviewed-on: http://codereview.qt.nokia.com/2457 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| * test: improved stability of tst_qwaitconditionRohan McGovern2011-08-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increased thread wait timeout from 3 to 10 milliseconds, for slower or heavily loaded machines. (There was a previous attempt to improve stability of this test some time ago by increasing the timeout from 1 to 3 milliseconds.) Note that this increases the runtime of the wakeOne test from ~5 to ~14 seconds. Change-Id: Ib556d4c949a6989fe71c11f5dc10feb2ec45c512 Reviewed-on: http://codereview.qt.nokia.com/2458 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| * test: fixed tst_qmessagebox and removed CONFIG+=insignificant_testRohan McGovern2011-08-022-85/+0
| | | | | | | | | | | | | | | | | | | | | | Removed some binary compatibility tests written specifically to test a change introduced between Qt 4.1 and 4.2. Qt 4 and 5 are not binary compatible, the test no longer makes sense. Change-Id: I3e8f9b6011105e504c20bedad51af8193b102552 Reviewed-on: http://codereview.qt.nokia.com/2464 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| * test: fixed spelling errors in tst_qtextscriptengineRohan McGovern2011-08-021-17/+17
| | | | | | | | | | | | | | | | couln't -> couldn't Change-Id: I37e86ecea74db1114fcfac93423388fae81df63d Reviewed-on: http://codereview.qt.nokia.com/2465 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * test: replace CONFIG+=insignificant_test with QEXPECT_FAIL for tst_qftpRohan McGovern2011-08-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | This autotest failure is entirely stable, so QEXPECT_FAIL should be used instead of insignificant_test. Task-number: QTBUG-20687 Change-Id: I0444e725b436fe93d30cbe54edc673594ca9b9fe Reviewed-on: http://codereview.qt.nokia.com/2486 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| * test: fixed tst_qfilesystemmodel and removed insignificant_testRohan McGovern2011-08-012-2/+4
| | | | | | | | | | | | | | | | | | | | | | tst_qfilesystemmodel::sort uses some internal API to affect the sorting behavior. This means that part of the test must be disabled when private symbols aren't available. Change-Id: I2e7b9d7a33cb3e7032bc5380c03fa29ecc84e12c Reviewed-on: http://codereview.qt.nokia.com/2413 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * Fixed tst_qprocess, tst_qtcpserver when crashing is slowRohan McGovern2011-08-012-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | These tests assumed that a crashing program will always exit within five seconds. This is not true in some situations. On our test macs, enabling crash dumps can easily cause a process to take longer than five seconds to crash. Increased the timeout to 30 seconds. Change-Id: Ifca240ac8d3da1346f33110653ac47de6ba2ab81 Reviewed-on: http://codereview.qt.nokia.com/2407 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| * Fix tst_qgraphicsview::task255529_transformationAnchorMouseAndViewportMarginsOlivier Goffart2011-08-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | If we do not process the event, q->underMouse may return false in QGraphicsViewPrivate::centerView (as the QEvent::Enter has not been received yet.) It was working before if by luck, the window appears under the cursor. Change-Id: I9b4497683eae20915680297013a9c21fd6275f4b Reviewed-on: http://codereview.qt.nokia.com/2385 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| * QMutex is now just a pointerOlivier Goffart2011-07-292-32/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And added a POD QBasicMutex. (QBasicMutex* can safely be static_cast'ed to QMutex*) The d pointer is not anymore always a QMutexPrivate. If d == 0x0: the mutex is unlocked If d == 0x1: the mutex is locked, uncontended On linux: if d == 0x3: the mutex is locked contended, waiting on a futex If d is a pointer, it is a recursive mutex. On non-linux platforms: When a thread tries to lock a mutex for which d == 0x1, it will try to assing it a QMutexPrivated (allocated from a freelist) in order to wait for it. Change-Id: Ie1431cd9402a576fdd9a693cfd747166eebf5622 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/2116 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Add notify signals for QIntvalidator, QDoubleValidator, QRegExpValidatorCharles Yin2011-07-293-1/+92
| | | | | | | | | | | | | | | | | | Task-number:QTBUG-19956 Change-Id: I5ab5e4494189ece5b0eb1f63e73e49cb2c4e9656 Reviewed-by:Michael Brasser Reviewed-on: http://codereview.qt.nokia.com/2147 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Make it possible to update a related table after an external updateAndy Shaw2011-07-291-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a table that is related to in a QSqlRelationalTableModel gets updated in some way (e.g. a new row, or the data is changed) then the related model could not be updated without recreating the QSqlRelationalTableModel. Now, to get around this, select() can be called on the related model to get it to be updated. Task-number: QTBUG-7885 Reviewed-by: Charles Yin Reviewed-by: Michael Goddard Change-Id: Ic589e840234f3a809bcb112a807a87afe0bc25ca (cherry picked from commit 2c60a4f67f9fb02f3b711fe749b2f293a07b4e02) Reviewed-on: http://codereview.qt.nokia.com/2224 Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * Emit selectionChanged signals when input method alters selection.Andrew den Exter2011-07-281-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | Mark the selection as dirty if an input method event contains a selection and emit selectionChanged() if it's not emitted by finishChange(). Task-number: QTBUG-19731 Change-Id: Ief6f06f40071f64dae4db0ba365676c059a39c7e Reviewed-on: http://codereview.qt.nokia.com/2081 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Mark tst_qsslcertificate::verify with QEXPECT_FAILRohan McGovern2011-07-281-0/+3
| | | | | | | | | | | | | | | | | | | | Test started to fail, complains about outdated SSL certificate. Task-number: QTBUG-20582 Change-Id: I2622375d9bc7b446dbbc18f72403896c60a8dee1 Reviewed-on: http://codereview.qt.nokia.com/2307 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
| * Revert "test: unmark tst_QWidget::getSetCheck() as "insignificant" for Linux"Michael Goddard2011-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 33cb4ff4d45ddf389a7c676b36ddaf45f20b2f37 Test still seems unstable :( Change-Id: I20d9c393e1553abba2a335532bee4e3ba716d8ce Reviewed-on: http://codereview.qt.nokia.com/2179 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
| * Add QFreeList as an internal classBradley T. Hughes2011-07-263-0/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a generic implementation of the lock-free free list found in qabstracteventdispatcher.cpp. Use next() to get the next free entry in the list, and release(id) when done with the id. This version is templated and allows having a payload which can be accessed using the id returned by next(). The payload is allocated and deallocated automatically by the free list, but *NOT* when calling next()/release(). Initialization should be done by code needing it after next() returns. Likewise, cleanup should happen before calling release(). It is possible to have use 'void' as the payload type, in which case the free list only contains indexes to the next free entry. Autotest included. Change-Id: Ifd12a961d47f3d76593c45061f72e55c9b80a43b Reviewed-on: http://codereview.qt.nokia.com/2160 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Emit selectionChanged signals when input method alters the selection.Andrew den Exter2011-07-261-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | Check if the input method removes the selection and force emit selectionChanged if it sets a new selection. Task-number: QTBUG-19727 Reviewed-by: Martin Jones Change-Id: Ic8ea1044d0917aac4e52368f431ac9e5c7db7c56 Reviewed-on: http://codereview.qt.nokia.com/2076 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Update cursor position when selection is reversed.Andrew den Exter2011-07-261-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A reversed selection will have the same resolved start and end positions but a different cursor position so testing the end points alone doesn't guarantee the selection is the same. Task-number: QTBUG-19456 Reviewed-by: Martin Jones Change-Id: I516e5a501ec878d673f21e54d688fd2d21b624ef Reviewed-on: http://codereview.qt.nokia.com/2080 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * test: unmark tst_QWidget::getSetCheck() as "insignificant" for LinuxSergio Ahumada2011-07-251-1/+1
| | | | | | | | | | | | Change-Id: I86570148f1fcbf2932c6314b0a6c666c02a3554f Reviewed-on: http://codereview.qt.nokia.com/2127 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| * Add initial support for bitmap version 4/5 headers.Ilya Konkov2011-07-254-0/+24
| | | | | | | | | | | | | | | | | | | | The headers are just skipped, information stored in them is ignored. Merge-request: 824 Change-Id: I48f37757114ed83cd5c92cb3d5a43eeaca4b91b3 Reviewed-on: http://codereview.qt.nokia.com/2108 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * Changed QLibrary::resolve() to return a function pointer.Kim Motoyoshi Kalland2011-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | According to the C++ standard, there is no guarantee that you can cast between function pointers and void pointers without data loss (section 5.2.10-6). Change-Id: I27f4d835e4c8ca8ecca0d76cfea9ce34491956bd Reviewed-on: http://codereview.qt.nokia.com/1995 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| * Delay masking the last character in Password echo mode.Andrew den Exter2011-07-251-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an integer value in milliseconds, QLineEdit and TextInput will display the last character entered unmasked for that delay period and then mask the character as normal. If QT_GUI_PASSWORD_ECHO_DELAY is not defined then the behaviour is unchanged. Task-number: QTBUG-17003 Reviewed-by: Martin Jones (cherry picked from commit f9e7aee2019d321edd655bfde7de43f20a106971) Conflicts: src/declarative/graphicsitems/qdeclarativetextinput.cpp tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp Change-Id: I3683223189b7176e4ef5081ee315c95a0efb9cfe Reviewed-on: http://codereview.qt.nokia.com/2060 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Add unit tests to QStringLiteral and QByteArrayLiteral with operator %Thiago Macieira2011-07-211-8/+39
| | | | | | | | | | | | | | | | | | | | This requires a fix for QByteArrayLiteral to work too. Change-Id: I3c2a50ad431d5b0c014a341e675fa54e7b206e70 Merge-request: 27 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1967 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * Silence expected warnings from QObject::connect()/disconnect()David Faure2011-07-211-0/+2
| | | | | | | | | | | | | | | | | | | | Merge-request: 4 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Change-Id: Ibee937140d0d81377c6adf74fce7856c4655b924 Reviewed-on: http://codereview.qt.nokia.com/1990 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * test: unmark tst_QNetworkAddressEntry::prefixAndNetmask as "insignificant"Sergio Ahumada2011-07-211-2/+0
| | | | | | | | | | | | | | | | | | It was fixed by cfbdb4cc8a3a1f9e0036ec387cbc00d2058ee6e7 Change-Id: I2cd1216235c77c6f2521a6d899e81e7e442758cd Reviewed-on: http://codereview.qt.nokia.com/1997 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| * Add support for rawFonts loaded from data in FaceIdPierre Rossi2011-07-211-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that with an empty filename and index of 0, all raw fonts loaded from data had the same FaceId, and we wouldn't bother to load another one after doing this once. This commit introduces a uuid in FaceId to help distinguish them in that case. Change-Id: I93655ff07a7d8856af1f854024e207c519f8ed1a Reviewed-on: http://codereview.qt.nokia.com/1882 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * test: fix tst_QFile::rename() autotestSergio Ahumada2011-07-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | This test was incorrectly assuming that a file named "Makefile" exists. Also removing the `insignificant_test' mark for Linux. Change-Id: I318b12f67e0476d6f08d1fc86194ca96f2bdb373 Reviewed-on: http://codereview.qt.nokia.com/1923 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Speed up tst_qcoreapplicationDavid Faure2011-07-211-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | It was emitting signals from a thread for 15 seconds. Doing this 10 times should be enough, and way faster. Also a race made it sometimes wait 15 seconds while nothing was happening, and then it would still succeed; the new code prevents this from happening. Change-Id: Ib36785dd8090047c760ddcca44fc805efaef1bd8 Merge-request: 4 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1989 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * tst_QNetworkAddressEntry::prefixAndNetmask use QHostAddress::AnyIPv4Martin Petersson2011-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | Update the test after the introduction of QHostAddress::AnyIPv4 in 85136496bc8517951dcc3e670d1a46d340819f0d Change-Id: I3b84e85b6dcefa69bf5953205e288a6f0affb341 Reviewed-on: http://codereview.qt.nokia.com/1873 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Markus Goetz
| * unmark tst_moc as failingOlivier Goffart2011-07-211-2/+0
| | | | | | | | | | | | | | | | | | It was fixed in 77ed8787ac9ef0f74c2ab6699af3fec434e433e5 Change-Id: Ic26bfd63c1e9025117fde048b2aa94c73ae7866d Reviewed-on: http://codereview.qt.nokia.com/1897 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* | Mac: build fixRichard Moe Gustavsen2011-08-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | qtbase failed building on Mac OS 10.5 and 10.6. This patch just rearrange some headers etc Change-Id: If85ac69029533a195249e84f8803ced6c0ff22b6 Reviewed-on: http://codereview.qt.nokia.com/2517 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* | Compilation of tst_qwidget.cpp.Friedemann Kleint2011-07-291-1/+19
| | | | | | | | | | | | | | Change-Id: Id1af7f98e1ef615f31e3512b57d727eda8b91f1f Reviewed-on: http://codereview.qt.nokia.com/2401 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Remove nativeimagehandleprovider.Samuel Rødal2011-07-273-247/+1
| | | | | | | | | | | | | | | | | | Symbian / OpenVG are currently not supported in Qt 5. Change-Id: I0a0e1dd9ac3f48c62c0e30baa4d32a087c15a766 Reviewed-on: http://codereview.qt.nokia.com/2194 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Compile fix for QImage autotest.Samuel Rødal2011-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | QImage::numBytes() is deprecated, QImage::byteCount() should be used instead. Change-Id: I0f885b91a49de59eb371da931bb64d2d57fcc0d0 Reviewed-on: http://codereview.qt.nokia.com/2177 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-21151-33/+730
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/cube/main.cpp examples/widgets/applicationicon/main.cpp examples/widgets/orientation/main.cpp src/gui/image/qicon.cpp src/gui/image/qimage.h src/gui/image/qpixmap.h src/gui/image/qpixmap_mac.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qpalette.cpp src/gui/kernel/qwidget.cpp src/gui/styles/qmacstyle_mac.mm src/gui/widgets/qmenubar.cpp src/gui/widgets/qslider.cpp src/opengl/qwindowsurface_gl.cpp tests/auto/qvariant/qvariant.pro tests/benchmarks/corelib/kernel/qobject/qobject.pro tests/benchmarks/gui/animation/qanimation/qanimation.pro tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro tests/benchmarks/gui/image/qimagereader/qimagereader.pro tests/benchmarks/gui/itemviews/qtableview/qtableview.pro tests/benchmarks/gui/kernel/qapplication/qapplication.pro tests/benchmarks/gui/kernel/qwidget/qwidget.pro tests/benchmarks/gui/painting/qpainter/qpainter.pro tests/benchmarks/gui/painting/qtbench/qtbench.pro tests/benchmarks/gui/painting/qtracebench/qtracebench.pro tests/benchmarks/gui/text/qtext/qtext.pro Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30
| * Fixed behavior on NULL foreign keysDaNiMoTh2011-07-201-9/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a simple INNER JOIN, like: SELECT a,b,rel.c FROM table1, table2 WHERE (table1.smthing = table2.smthing) which doesn't show row where foreign keys are NULL, allow use of LEFT JOIN like: SELECT a,b,rel.c FROM table1 LEFT JOIN table2 ON table1.smthing = table2.smthing The trick works also for multi-relational tables. Just remember to use the new API setJoinMode. Signed-off-by: DaNiMoTh <jjdanimoth@gmail.com> Task-number:QTBUG-8217 Reviewed-by:Michael Goddard Reviewed-by:Charles Yin Merge-request: 2576 Reviewed-by: Charles Yin <charles.yin@nokia.com> (cherry picked from commit c4280dbd9bb37cca21d007f5f8b9217f80b44043) Change-Id: I349f9418e4859923977942add59872b000cac2c5 Reviewed-on: http://codereview.qt.nokia.com/1853 Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * Add a qHash for QUuidOlivier Goffart2011-07-191-0/+11
| | | | | | | | | | | | | | | | Change-Id: Ib0d9a765b8db3b34aa20d510de501c72a54cacbe Reviewed-on: http://codereview.qt.nokia.com/1743 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| * QNetworkAccessFileBackend: Do not accept file url without scheme set.Martin Petersson2011-07-191-9/+0
| | | | | | | | | | | | | | | | | | | | In Qt 4.8 this generated a warning. For Qt 5 we should no longer accept file urls without a scheme set. So you should use file:// for local files. Change-Id: I57789e2b56b712aa4f370aec9437c6febf0d0211 Reviewed-on: http://codereview.qt.nokia.com/1822 Reviewed-by: Markus Goetz