summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* QPrintSupport: Move QAbstractPrintDialog test into QPrintSupportJohn Layt2013-10-266-3/+4
| | | | | | | Move the test for QAbstractPrintDialog from widgets into printsupport Change-Id: Ia7595fa650a7ad565df3090207500ed06564e842 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Introduce QTextDocument::baseUrlJ-P Nurmi2013-10-251-0/+50
| | | | | | | | | Required for QQuickText & friends to implement image resource handling in a clean way - to get rid of QQuickTextDocumentWithImageResources and eventually make QQuickTextEdit's document interchangeable. Change-Id: I97314a6c3e2d5726539d5722795a472631388cb0 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-2460-224/+966
|\ | | | | | | Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2
| * QFileDialog can delete files too, not just directoriesShawn Rutledge2013-10-231-0/+20
| | | | | | | | | | | | | | | | | | After Ic12de12ec51c20de52d040514e90be5e783add43 this functionality was broken. Added an autotest. Task-number: QTBUG-34159 Change-Id: I8f41b7073dc57fea855ab87796f09e8a91520d13 Reviewed-by: David Faure <david.faure@kdab.com>
| * QTextHtmlParser: restore the default link color from app paletteJ-P Nurmi2013-10-231-0/+28
| | | | | | | | | | | | | | | | | | | | The default link color used to be resolved to the link color of the application palette, but got lost during the Qt 5 modularization (see commits 7351a43 and 3f9a7f9). Task-number: QTBUG-28998 Change-Id: I7f07427f6c03f83c557100938ad9f7a39349d303 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Better QWindowContainer by not relying on native widgets.Gunnar Sletta2013-10-221-4/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | We change the behavior slightly from the initial implementation in 5.1. Forcing the use of native child widgets is causing massive performance issues so instead, we attach the embedded QWindow directly to the root window. The only exception is QScrollArea and QMdiArea which still enforces native windows for the entire parent chain to make clipping and stacking work. Task-number: QTBUG-34138 Change-Id: If713637bd4dce630552ace2f8ad6b2e86c063721 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * tests: Replace Q_OS_MACX -> Q_OS_OSXSergio Ahumada2013-10-216-12/+12
| | | | | | | | | | | | | | | | Use the correct identifier for the OS X operating system. Change-Id: I7158a6b77e5e7418bc6b0a565f003500820a346d Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * Enabling CI usage for runtests_androiddeployqt.plSimo Fält2013-10-201-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed issues when having multiple devices connected at the same time. - Fixed hard coded paths - Removed not existing function call, which caused test run to exit too early. - Added possibility to add and connect to device, configured as env variable. Task-number: QTQAINFRA-641 Change-Id: I8c1e003ce4ffbc9fdd9572dc55eef8fe92330cba Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * exclude gui-needing tests from -no-gui buildOswald Buddenhagen2013-10-184-1/+11
| | | | | | | | | | Change-Id: I91f7211efe44cbb41aa3058f85869a6babf121f3 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * When creating QVariant(QPolygonF()) this should be a null variantAndy Shaw2013-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The handling of the null QPolygonF case was not correct as it would always be seen as valid. This ensures it is treated in the same way as QPolygon when it is in fact null. [ChangeLog][QtGui][QPolygonF] When a QVariant holds a QPolygonF() then it will be correctly seen as a null QVariant. Change-Id: Icae34f513c3a8e1dd3f50cb64a3d13ae7c636cc4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * QDateTime - Fix RFC 2822 Date FormattingJohn Layt2013-10-171-0/+4
| | | | | | | | | | | | | | | | | | The RFC 2822 date format should always use en_US locale for month and day names instead of whatever the system locale is. Also remove some duplicate code. Change-Id: Ia2f7ee405b4e0e2f04980301783b9488628da73f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Add explanation to QEXPECT_FAIL statementsKurt Pattyn2013-10-171-42/+42
| | | | | | | | | | | | | | | | Added clarifying explanations to the QEXPECT_FAIL statements. Now it should be easier to understand what is expected from the parser. Change-Id: I1dacd60564f292d9ce43de7254525c34fa7cdc55 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Allow non-character codes in utf8 stringsKurt Pattyn2013-10-178-76/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the processing of non-character code handling in the UTF8 codec. Non-character codes are now accepted in QStrings, QUrls and QJson strings. Unit tests were adapted accordingly. For more info about non-character codes, see: http://www.unicode.org/versions/corrigendum9.html [ChangeLog][QtCore][QUtf8] UTF-8 now accepts non-character unicode points; these are not replaced by the replacement character anymore [ChangeLog][QtCore][QUrl] QUrl now fully accepts non-character unicode points; they are encoded as percent characters; they can also be pretty decoded [ChangeLog][QtCore][QJson] The Writer and the Parser now fully accept non-character unicode points. Change-Id: I77cf4f0e6210741eac8082912a0b6118eced4f77 Task-number: QTBUG-33229 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Add JSON parsing support to qmake.Morten Johan Sørvig2013-10-173-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add qjson* implementation files from corelib/json to the qmake build. Add a read-only compile mode, enabled by defining QT_JSON_READONLY. Add qmake built-in function parseJson(file, into) which parses a json file into the given variable. qmake uses a flat key -> value-list implementation for storing variables, which means that some hackery is need to represent arbitrarily nested JSON. Use a special "_KEYS_" variable for arrays and objects: Arrays: ["item1", "item2"] $${array._KEYS_} -> 0 1 2 $${array.0} -> "item1" $${array.1} -> "item2" Objects: { "key1" : "value1", "key2" : "value2" } $${object._KEYS_} -> key1 key2 $${object.key1} -> value1 $${object.key2} -> value2 Change-Id: I0aa2e4e4ae14fa25be8242bc16d3cffce32504d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * QDateTime - Fix toTimeSpec() for invalid datetimesJohn Layt2013-10-161-0/+21
| | | | | | | | | | | | | | | | | | | | Check if the datetime is valid before converting it to a different time spec. If it is invalid then just change the spec to keep behavior consistent with 5.1. Task-number: QTBUG-34020 Change-Id: I6630ec1d50f810a2178ab3222bd32af018085f81 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Print non-default categories in default message handlerKai Koehne2013-10-162-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default output of the logging framework to prefix messages with a 'category: ' in case the category is not "default", so that e.g. QLoggingCategory cat("qt.core.codes.windows"); qCWarning(cat) << "MultiByteToWideChar: Cannot convert multibyte text"; will print qt.core.codes.windows: MultiByteToWideChar: Cannot convert multibyte text while output from qWarning etc will show unaltered output. This should help users to discover categories, and to group output together. Change-Id: Iac2e1514f7dc5671966c36a440a119c857564cfc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: hjk <hjk121@nokiamail.com>
| * don't test Qt::codecForHtml() - build with -no-guiOswald Buddenhagen2013-10-162-3/+2
| | | | | | | | | | | | | | | | the function is a trivial wrapper for the QTextCodec one, so there is little point in explicitly testing it. Change-Id: I0c4950e5a54b7ffff9ba73a001cedb517497a596 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * don't erroneously claim that gui support is neededOswald Buddenhagen2013-10-1614-13/+14
| | | | | | | | | | Change-Id: Ia7b1f02cab9fa0fc9e487ca49d75e85ed0cfee9d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Android: Add test script based on androiddeployqtEskil Abrahamsen Blomfeldt2013-10-161-0/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few problems with the Quadruplor setup in Qt 5. First of all, it doesn't work with modules, since it has a hard coded library dependency list. Second of all, it duplicates the application template, so changes need to also be duplicated. This often gets out of sync. Third of all, it duplicates a lot of deployment rules which are now contained in androiddeployqt. Task-number: QTBUG-33996 Change-Id: I0630a38aeba7d0075df8fae671abc311fc36de61 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * Android: Build autotest service against android-10Eskil Abrahamsen Blomfeldt2013-10-161-1/+1
| | | | | | | | | | | | | | | | No need to default to yet another SDK here. This is a left-over from Necessitas, which supports versions down to android-4. Change-Id: I2e79be641288c14f92c205b30f2db6db793d783f Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * Add missing operators QMargins -=,+= (int).Friedemann Kleint2013-10-151-0/+6
| | | | | | | | | | | | | | Task-number: QTBUG-34079 Change-Id: If61cc01ba70345b01f13072769d3a38f23e8cefc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Only emit messageChanged() if the message has actually changedAndy Shaw2013-10-151-0/+27
| | | | | | | | | | | | | | | | | | This fixes QStatusBar so it is back to the original behavior of only emitting the signal when the message has changed. The intention of the code that caused this to break in the first place is kept intact. Change-Id: I2f57c2abec01246ed924626ad954ac9ff9889855 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Change return type of imagePosition to QPointJan Arve Saether2013-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QAccessibleImageInterface already has an API to return the size of the image. This function ensures that their API's are not overlapping. Alternatively, we could merge both functions into QAccessibleImageInterface::imageRect(), but the assumption is that images change position more often than their size. Change-Id: I55c25cdff187b9f497828f04cfd5f969cfbc451f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * QFileDialog: don't create widgets if the platform dialog will be usedShawn Rutledge2013-10-151-0/+17
| | | | | | | | | | | | | | | | | | | | | | This is a performance and memory optimization which also fixes bugs that are related to creating widgets, file system models etc. despite using platform native dialogs. Similar to 785bc64f8e743ac269f15cbe7fecba93d3d507ac for QColorDialog. Task-number: QTBUG-33039 Change-Id: Ia1aa7ec1f43b47006b9ebd377aed15c958538a17 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Account for QPolygonF type when loading/saving the QVariantAndy Shaw2013-10-154-0/+48
| | | | | | | | | | | | | | | | | | | | | | When the QPolygonF type was added to QMetaType it did not bump up the values in load() and save() for QVariant. Task-number: QTBUG-33981 Change-Id: I7ad99cda70620c5449c15527c3daf920972d047f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Skip tst_QGraphicsItem::paint() on Mac OS X 10.7Simo Fält2013-10-151-0/+4
| | | | | | | | | | | | | | | | | | The test is randomly failing on CI when ran on 10.7. Task-number: QTBUG-31454 Change-Id: I79fce9a37616c6abaee960e338f8eea8fe6f31cf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Stabilize tst_qmenu on Mac.Friedemann Kleint2013-10-141-3/+9
| | | | | | | | | | | | | | | | | | Position cursor outside and move once more. Task-number: QTBUG-33972 Change-Id: If060f1359361981cf1243d8d2a4ebef181689d74 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Accessibility: simplify dockwidget accessibleFrederik Gladhorn2013-10-141-33/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch merges the two classes that were used to make dock widgets accessible into one. The title bar does not need to be represented by its own accessible object. In addition the buttons on the toolbar are now labelled. Task-number: QTBUG-33946 Change-Id: Id90d8c09f15ed683e64dbe3f6ac55bca7a0b300f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Export the block's line-height settings to htmlAndy Shaw2013-10-121-0/+20
| | | | | | | | | | | | | | | | Task-number: QTBUG-28404 Change-Id: I87e03ecd981c302a5aefdadf7bcfd9729e37bd13 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * rewrite qtMetaObjectInheritance() without guiOswald Buddenhagen2013-10-112-9/+9
| | | | | | | | | | Change-Id: Ie024a3ee755cfe4996ed442686cd73ce13a2d5ff Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * support building with -no-guiOswald Buddenhagen2013-10-112-1/+8
| | | | | | | | | | | | Change-Id: I1c418e2aa6c01dbc40156a3494a7f7ddc95beca3 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Jason McDonald <macadder1@gmail.com>
| * Let QLoggingCategory::defaultCategory return a pointerhjk2013-10-111-16/+16
| | | | | | | | | | | | | | | | The pointer can be null. Going trough the reference invokes undefined behavior here. Change-Id: Ia84e4e732cdcbbaee0f5f0679765d18069ea8b2d Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Stabilize tst_QComboBox::keyBoardNavigationWithMouse.Friedemann Kleint2013-10-111-5/+15
| | | | | | | | | | | | | | | | The cursor needs to be within the view from start on Mac. Task-number: QTBUG-33973 Change-Id: I313c9fd1c3a917e135a92497f1818d1b0d8b7698 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Fix a bug in QSqlQuery::isNull documentationTasuku Suzuki2013-10-221-0/+3
| | | | | | | | | | | | | | | | the method returns true if there is not such field. Change-Id: I25db8de4561d3e0604f3e64edc1810140ba4aad2 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | Fix settable style hints.Friedemann Kleint2013-10-221-0/+18
| | | | | | | | | | | | | | | | | | | | Introduce QStyleHintsPrivate and introduce internal setters called by QApplication. Task-number: QTBUG-33991 Change-Id: Id61f8b1e2b5c9cfd7b4713aaded66e93e6f63719 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-116-28/+72
|\ \ | |/ | | | | Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
| * Ensure CSS rules are inherited from the parent tagsAndy Shaw2013-10-111-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CSS was set in the head tag then it was not being inherited by the child tags. This ensures that the inhertiance happens and that the deeper the CSS is set then it will ensure that it has precedence over the ones set on the parent. A test is added that shows the standard inheritance from the head tag and the precedence from child tags in effect too. Task-number: QTBUG-28770 Change-Id: I30be3ec141b2cd8d6e0db8a92669aed34da93b33 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * don't unnecessarily use qtguiOswald Buddenhagen2013-10-082-8/+8
| | | | | | | | | | Change-Id: Ia4162d75ef6ebf87f36d40163d5ffc89eae64dc6 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * Allow to use short names for Windows Registry root keysSebastian Schuberth2013-10-071-0/+13
| | | | | | | | | | | | Change-Id: I58b7681bb49e93b7577bc559d754c81d3c6f007b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Replace QLoggingCategory::isEnabled by non-template functionshjk2013-10-061-18/+20
| | | | | | | | | | | | | | | | | | This yields the same results as previously and is more in line with existing interfaces. Change-Id: I0bf0372bf18f3bfde579385cddbe594bf71e3c52 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix potential crash: adding int to stringFrederik Gladhorn2013-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | qtbase/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp:652:36: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] f.write(QByteArray("i am " + i)); ~~~~~~~~^~~ qtbase/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp:652:36: note: use array indexing to silence this warning f.write(QByteArray("i am " + i)); ^ & [ ] Change-Id: Icc966559be3c2cde3416193b8a1ddab7e0323ade Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Sergio Ahumada2013-10-0912-161/+267
|\ \ | | | | | | | | | refs/staging/dev
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-0412-161/+267
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/minimal/qminimalintegration.cpp src/plugins/platforms/offscreen/qoffscreenintegration.cpp Change-Id: Ica85deeab5c5038ac004718e25194b1157343480
| | * Fix temporary file leak in tst_qfiledialog2.Friedemann Kleint2013-10-031-6/+5
| | | | | | | | | | | | | | | | | | | | | Change-Id: I5a1e601e3aa6e84300efa09bfbd9232fecab903e Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: David Faure <david.faure@kdab.com>
| | * Fix QStandardPath test on some linuxesFrederik Gladhorn2013-10-021-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | On one suse box I have both /usr/bin/sh and /bin/sh which means that the test should prefer the one first in the path instead of random order. Change-Id: Ie94bf8404479fa42a36a8ee45e09986114693871 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * AccessibleRelation::get_relationType didn't handle all enum values.Jan Arve Saether2013-10-021-4/+59
| | | | | | | | | | | | | | | | | | Add some more tests for relations Change-Id: I934cd6aed36ca5ca88786325ed364fbc3abfc6f7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * Base tst_QGuiApplication on tst_QCoreApplication to increase GUI ED coverageTor Arne Vestbø2013-10-015-49/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QCoreApplication test has quite a few test cases that we would like to exercise using the GUI event-dispatcher. Instead of duplicating the tests for the GUI dispatcher, we inherit tst_QCoreApplication, which also lets us add extra tests that are specific to tst_QGuiApplication. Change-Id: Ib411457131b8d3fed871f682c1c0568577f6127d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * Fix temporary directory leak in tst_qsavefile.Friedemann Kleint2013-10-011-45/+24
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-33769 Change-Id: I5177f09df22fd2b9b0d9eca4301c383c600d5ab8 Reviewed-by: David Faure <david.faure@kdab.com>
| | * OpenGL autotests: verify create()/makeCurrent()Andrew Knight2013-09-302-16/+16
| | | | | | | | | | | | | | | | | | | | | If create() or makeCurrent() calls fail, the test should fail fast. Change-Id: I025c541f94c8eee492cf0e1545bfbb8027eff2a7 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * tst_qsavefile: Check temporary dir and output open errors.Friedemann Kleint2013-09-301-12/+27
| | | | | | | | | | | | | | | Change-Id: Id28306ad414050a37b7779525f36edc3e15281b5 Reviewed-by: David Faure <david.faure@kdab.com>