summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* moc generated code should compile with QT_NO_KEYWORDSOlivier Goffart2013-08-221-0/+5
| | | | | | | | | Don't use the 'emit' keyword in the moc generated code for properties with MEMBER Task-number: QTBUG-33094 Change-Id: I5a0950e9c7a0dee347a6a6c79098e3e7d4776014 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* moc: Fix related objects containing itselfOlivier Goffart2013-08-221-0/+26
| | | | | | | | | | This may happen when we have namespaces and the qualified name is used to scope an enum. Task-number: QTBUG-32933 Change-Id: Ic4923bbfb138387bae1e3694172661ace8342089 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* moc: Issue a warning instead of an error when macro argument mismatchOlivier Goffart2013-08-221-1/+9
| | | | | | | | | | | | | moc's C++ is not 100% accurate, so better process the invalid macro with a warning rather than an error. Such errors occurred in the QSKIP macro with variadic arguments since that macro is defined conditionally. It is also causing problem in boost header (cf task QTBUG-29331) Task-number: QTBUG-29331 Change-Id: Ice6a01b675286540d6470c8e36920b7efd39b540 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* tests: Make the QT assignments more explicitSergio Ahumada2013-08-2116-32/+15
| | | | | | | | Remove unused 'QT -= gui' and replace some others with 'QT = core ...' Change-Id: I2d14fae963afc21dbd21a4acdbba2c30cdf8fa61 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* CMake: Allow specifying a TARGET in invocations of macros.Stephen Kelly2013-08-216-0/+245
| | | | | | | | | | | | Forward-port of 9ce60ff509c4ff27fe861fc5b2080f50897a68c4 (Qt4Macros: Allow specifying a TARGET in invokations of macros., 2013-02-26) from cmake.git. This causes the INCLUDE_DIRECTORIES and COMPILE_DEFINITIONS to be used from the specified target when running moc. Change-Id: I868a35ade3c6b059e64d226291cf2046709d86d4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Populate INTERFACE_LINK_LIBRARIES property in the cmake files.Stephen Kelly2013-08-215-0/+183
| | | | | | | | This is new in CMake 2.8.12 and replaces the old properties matching IMPORTED_INTERFACE_LINK_LIBRARIES_<CONFIG>. Change-Id: I5d4c454972f2535f6792e95718c73d80c56ac24c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add debugging output to randomly failing test.Stephen Kelly2013-08-211-3/+1
| | | | | | | | | | | | | | | | | The result at http://thread.gmane.org/gmane.comp.lib.qt.ci-reports/12118 shows an unusual value. The expected output is QDEBUG : tst_QColumnView::scrollTo() last= 0 ; HorizontalOffset= -256 QDEBUG : tst_QColumnView::scrollTo() last= -256 ; HorizontalOffset= -512 QDEBUG : tst_QColumnView::scrollTo() last= -512 ; HorizontalOffset= -768 QDEBUG : tst_QColumnView::scrollTo() last= -768 ; HorizontalOffset= -1024 Change-Id: I8db091f4390cb1a41547d44ca966d172ac278e1a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QtBase: Skip some tst_qwidget steps in Ubuntu 11.10Simo Fält2013-08-192-0/+10
| | | | | | | | | Same steps keeps failing on Ubuntu 11.10 without valid reason. Task-number: QTBUG-30566 Change-Id: Ic7bf65496ff9ad9c4fdef42a30b808aa2c45a1e5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix QGraphics(Ellipse)Item autotestGiuseppe D'Angelo2013-08-191-4/+7
| | | | | Change-Id: I6d5d702e97a0186979bd3bdcd0526d53afeecbd8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix QPointF::division autotestGiuseppe D'Angelo2013-08-191-2/+2
| | | | | Change-Id: I567c1252b63aff4273bf15c0d52817f058ea0703 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Add manual test for shortcutsGatis Paeglis2013-08-193-0/+155
| | | | | Change-Id: I98ba26d97ca60c4a4e22da3b856d0e7e366e6690 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* test: Skip some more qsslsocket flaky tests [part 2]Sergio Ahumada2013-08-161-5/+13
| | | | | | Task-number: QTBUG-29941 Change-Id: I28e71f952fcade6ab0aa76db71a1e2f408952830 Reviewed-by: Richard J. Moore <rich@kde.org>
* QHeaderView::paintSection(): fix visible index handlingJ-P Nurmi2013-08-151-0/+65
| | | | | | | | | | | Sections may be hidden => QStyleOptionHeader::position must reflect the state seen on the screen. Otherwise styles will give wrong visual results. Task-number: QTBUG-32203 Change-Id: I7ef86496be092bf6f52ec45f757b501f38c3a431 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix crash in QProcess::waitForStarted() on Unix.Christian Strømme2013-08-131-0/+7
| | | | | | | | | | | | Invoking waitForStarted() on a QProcess before or after an unsuccessful call to start() (e.g., with an empty command), would execute FD_SET with an invalid file descriptor and cause the process to abort. The bug can be reliably reproduced on OSX. Task-number: QTBUG-32958 Change-Id: Id25b7781168489281645e21571361ca1a71d43e3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* RCC: Make auto-test pick up the right binaryhjk2013-08-131-6/+10
| | | | | | Change-Id: I30f42d40c69789eb1e292ab6bd1cf2c09d81b11b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* test: Skip some more qsslsocket flaky testsSergio Ahumada2013-08-131-4/+9
| | | | | | Task-number: QTBUG-29941 Change-Id: Iaf1c4834ef36db284464184639a1ab00928510cf Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* Make the QItemSelectionModel test widgets-independent.Stephen Kelly2013-08-133-54/+51
| | | | | Change-Id: I695afe535ff291bc98f43185469a434cd9178926 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Add auto-test for running the QEventLoop test with the GUI dispatcherTor Arne Vestbø2013-08-124-1/+9
| | | | | | | Follows a similar include-pattern as the qguieventdispatcher test. Change-Id: Ie8669a5bc155abd6687e81526f2b95d0d19b009e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Don't assume Q_OS_UNIX means we support QEventLoop::X11ExcludeTimersTor Arne Vestbø2013-08-122-3/+19
| | | | | | | | | | | A QCoreApplication may run a different event dispatcher, such as the QEventDispatcherBlackberry, and QGuiApplications will have the GUI dispatcher provided by the QPA plugin, such as QCocoaEventDispatcher. Neither support X11ExcludeTimers. Change-Id: Id5ea1c7dd74a127e13fa4d2eaa9a1bd2715a9dbb Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add some debugging information to diagnose bug.Stephen Kelly2013-08-121-2/+11
| | | | | | | Task-number: QTBUG-32927 Change-Id: I7d0a1ad9eeb63ac0ec28483106f42109ed1a834c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* test: Mark tst_QFileSystemWatcher::watchFileAndItsDirectory() as XFAILSergio Ahumada2013-08-111-1/+6
| | | | | | | | | This is a flaky test on Windows 8 64-bit, so marking it as XFAIL if it is expected to fail. Task-number: QTBUG-30943 Change-Id: Idd276f80b54fcd5cf295a7e1adebcf0020eaa8ca Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* test: Skip some flaky tests, but only if they are expected to failSergio Ahumada2013-08-101-33/+77
| | | | | | Task-number: QTBUG-29941 Change-Id: Ieca736c26711fa292855b3281229282628dce608 Reviewed-by: Richard J. Moore <rich@kde.org>
* test: Mark tst_QGlyphRun::drawMultiScriptText2() as XFAILSergio Ahumada2013-08-091-0/+4
| | | | | | | | | This is a flaky test on OS X 10.8, so marking it as XFAIL if it is expected to fail. Task-number: QTBUG-32690 Change-Id: I0665c7474bb62c4c0a70e4b93cc977e3dbf1e150 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Merge branch 'release' into stableSergio Ahumada2013-08-091-0/+44
|\ | | | | | | Change-Id: I5e94c4f01564df633c9925561ebb0b553bd31a2e
| * QHttpMultiPart: fix data corruption in readData methodPeter Hartmann2013-07-291-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When readData() is called repeatedly, we need to keep track which part of the multipart message we are currently reading from. Hereby we also need to take the boundary size into account, and not only the size of the multipart; otherwise we would skip a not completely read part. This would then later lead to advancing the read pointer by negative indexes and data loss. Task-number: QTBUG-32534 Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | Expect fail font family mismatch in the right placeFrederik Gladhorn2013-08-081-9/+9
| | | | | | | | | | | | | | | | This fixes 4ca4fb93f666820ab10fc0e17f54b2b777540779 where the fix was right, just in the wrong place. Change-Id: I3cde24624e3789870f1c16ccb92f78f7fc567fd5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Revert c3f485c5250a503832e767e1fe5e40595126f6c5Albert Astals Cid2013-08-083-131/+0
| | | | | | | | | | | | | | | | | | | | It has been discovered it changes the behavior of qdbuscpp2xml resulting in builds of some apps breaking. Even if the behavior is more correct, such behavior change in a stable branch is not acceptable Change-Id: I1d79104ebf11c3f48c84f109be2926af96cddae7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QComboBox: fix item activation via completerJ-P Nurmi2013-08-081-0/+35
| | | | | | | | | | | | | | | | Task-number: QTBUG-31146 Change-Id: I64291f397d80bf934152f63e629810540abf466e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* | test: Mark tst_QSettings::ctor() and ↵Sergio Ahumada2013-08-081-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QSettings::rainersSyncBugOnMac(native) as XFAIL Mark some tests as expected failures on OS X 10.8 - tst_QSettings::ctor(native) - tst_QSettings::ctor(ini) - tst_QSettings::ctor(custom1) - tst_QSettings::ctor(custom2) - tst_QSettings::rainersSyncBugOnMac(native) Task-number: QTBUG-32655 Change-Id: I54928d991a8ccf300b40747feaa6fda9d124781b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Fix QCompleter::activated(QModelIndex)J-P Nurmi2013-08-071-0/+5
| | | | | | | | | | | | | | | | | | When falling back to the completion prefix, make sure to also pass an invalid index to activated(). Change-Id: I6b282a01c95492466890632b77837bcc96eb038a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* | Improve tst_QFileInfo::compare() test, but mark as QEXPECT_FAIL on MacTor Arne Vestbø2013-08-071-11/+6
| | | | | | | | | | | | | | | | | | As Qt still thinks that all UNIX filesystems are case sensitive, which is not the case for eg Mac, where they might be both, as well as for mounts of other filesystems. Change-Id: I07b8550685bfa17ac407c20ac991dc54df040942 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | qobject: Do not destroy slot objects inside a lockDario Freddi2013-08-071-7/+51
| | | | | | | | | | | | | | | | | | This prevents deadlocks in case the destructor re-enters. (Example: a functor containing a QSharedPointer of a QObject) This also fixes a leaked slot object in disconnectHelper. Change-Id: Ia939790e3b54e64067b99540974306b4808a77f2 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Fixed tst_qgl for fullscreen platformsBernd Weimer2013-08-071-2/+2
| | | | | | | | | | | | | | Replaced show() with showNormal(). Change-Id: Ia6e7f34587090de5019f9ca9cb82a44e7cf495e5 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | Expect fail broken font family from QFontDatabase on OS X 10.8Frederik Gladhorn2013-08-071-0/+9
| | | | | | | | | | Change-Id: I682d58350427975a692b523095c1c38e1891663f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Remove unused member in QEventLoop auto-testTor Arne Vestbø2013-08-061-2/+1
| | | | | | | | | | | | Change-Id: Icd6a09402c3cf14286f4ba1f8f4c99ac483ec1a3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | test: Mark tst_QRawFont::fromFont() as XFAILSergio Ahumada2013-08-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark some tests as expected failures on OS X 10.8 - tst_QRawFont::fromFont(testfont.ttf, hintingPreference=0, writingSystem=0) - tst_QRawFont::fromFont(testfont.ttf, hintingPreference=0, writingSystem=5) - tst_QRawFont::fromFont(testfont.ttf, hintingPreference=0, writingSystem=1) - tst_QRawFont::fromFont(testfont.ttf, hintingPreference=1, writingSystem=0) - tst_QRawFont::fromFont(testfont.ttf, hintingPreference=1, writingSystem=5) - tst_QRawFont::fromFont(testfont.ttf, hintingPreference=1, writingSystem=1) - tst_QRawFont::fromFont(testfont.ttf, hintingPreference=2, writingSystem=0) - tst_QRawFont::fromFont(testfont.ttf, hintingPreference=2, writingSystem=5) - tst_QRawFont::fromFont(testfont.ttf, hintingPreference=2, writingSystem=1) - tst_QRawFont::fromFont(testfont.ttf, hintingPreference=3, writingSystem=0) - tst_QRawFont::fromFont(testfont.ttf, hintingPreference=3, writingSystem=5) - tst_QRawFont::fromFont(testfont.ttf, hintingPreference=3, writingSystem=1) Task-number: QTBUG-32654 Change-Id: I46d64852ccb751824a2eff68513389baa52c1baf Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | tst_qfilesystemmodel: increased test's permitted runtimeSergio Ahumada2013-08-061-1/+2
| | | | | | | | | | | | | | | | | | | | This test has recently timed out a few times on OS X test runs, with no relevant changes to account for the timeout. Task-number: QTBUG-27890 Change-Id: Ia24f7812ed2a0b3eac51847a7dacbc9f225b48b8 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Fix double transform for items ignoring parent transformations.Andreas Aardal Hanssen2013-08-051-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the topmost untransformable's scene transform, which includes the item's position and local transformation, was used to determine the item's anchoring position. This position was then passed on to be multiplied by the item's transform again. This works fine for toplevel untransformable items that don't have any transform set at all, but those who do would have their transforms applied twice - one to determine the anchoring position, and again to transform the item itself. Since only translation transformations can affect the first operation (the anchoring pos), this bug only applies to items that set ItemIgnoresTransformations and use a local transform that includes translation. Task-number: QTBUG-21618 Change-Id: I772d52d59dfd9f242d0140632a87e9c68dfe0ea1 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Fix tst_QFile::caseSensitivity on OS XTor Arne Vestbø2013-08-051-1/+4
| | | | | | | | | | | | | | | | By not assuming that the file system is case insensitive. OSX supports both. Change-Id: I11a4ac4cdff97b97b183dd319757a42ae14bb52d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Fix tst_QCompleter::directoryModel() on OS XTor Arne Vestbø2013-08-051-1/+1
| | | | | | | | | | | | | | | | By not assuming that we have the '/Developer' directory at the root of the file system. 'Users' is less likely to be removed/deprecated. Change-Id: I659bdb67cfb1ed2f73bc643ba4afe1f1f89d5bc5 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | tests: Enable some itemmodels tests that don't depend on Qt WidgetsSergio Ahumada2013-08-051-3/+3
| | | | | | | | | | | | | | | | Make qabstractproxymodel and qidentityproxymodel build and run even if -no-widgets is used since they don't depend on Qt Widgets. Change-Id: I48bc2f6a78812b1bf0083f76c6a4e106f4e38650 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | QMimeDatabase: Fix handling of duplicate mimetype definitions (2/2).David Faure2013-08-031-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | 7721c3d27c6a fixed the case where two similar definitions are in the same directory. This commit fixes the case where two similar definitions are in different directories, both in the search path (GenericDataLocation). If the file extension gives us the same mimetype twice, there's no conflict, i.e. no reason to fallback to determination from contents. Change-Id: I72c56004b6d5e88964159e53ec160ce8b06c2264 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Update Info.plist templates to use the current standard plist format.Jake Petroules2013-08-021-15/+15
| | | | | | | | | | | | | | | | Change the version number to 1.0, and use the public doctype. Change-Id: I9b071c80c410c31c38813c4447edd7b186226fab Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Expose invokables that are not slots in the xmlAlbert Astals Cid2013-07-303-0/+131
| | | | | | | | | | | | | | Without it the invocations were working but were not listed on introspection Change-Id: Ie62f7dc3577f52b6888ddebf0392fdf51f2845d5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Cocoa: Make sure that resizeEvent is invoked after calling resizeNils Jeisecke2013-07-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QWindow::resizeEvent documentation states that resizeEvent is invoked after the windowing system has acknowledged a setGeometry() or resize() request. The Cocoa plugin however did set the platform window geometry immediately so that the qnsview's updateGeometry returned too early. Task-number: QTBUG-32706 Change-Id: I1f359ab368833d174ab6740f4467b0848c290f13 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Mark tst_exceptionsafety as insignificantSimo Fält2013-07-291-1/+1
| | | | | | | | | | | | | | | | We're rolling back exception safety support Task-number: QTBUG-32642 Change-Id: I25f20b554a93f25d00cca19b3e308d6cc8fe85e2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | test: Remove insignificant mark from tst_qfilesystemmodelSergio Ahumada2013-07-261-2/+0
| | | | | | | | | | | | | | | | Tests are passing nowaways on OS X. Task-number: QTBUG-27890 Change-Id: I6a0a881ece844ef931cb8af51b58d33c40be4d2c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Fix for tst_qundogroup autotest in shadow buildSimo Fält2013-07-251-2/+7
| | | | | | | | | | | | | | | | | | Added full path to src dir for testdata. Task-number: QTBUG-32535 Change-Id: I38e96216e9a016869151adf0ae995e068b8b5354 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Fix for tst_qundostack autotest in shadow buildSimo Fält2013-07-251-2/+6
| | | | | | | | | | | | | | | | Added full path to src dir for testdata. Task-number: QTBUG-32536 Change-Id: I5ef215d451a6407c277d2c98f21ffc35a8657e28 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Fix crashes when invoking toVariant() on empty QJsonValue objects.Friedemann Kleint2013-07-241-0/+4
|/ | | | | Change-Id: I51cd114e862c6fad564484e990348f324ad56ab9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>