summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix tst_comboboxv5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0J-P Nurmi2017-11-231-19/+5
| | | | | | | | | | | | | There was a bogus timer firing once after the test had been running 500 ms. The timer was supposed to be used as a workaround on Mac, but since it had running set to true, it was actually firing once on all platforms. The timer was originally added in 6254af5. The test function ended up being skipped on Mac, so the timer was actually pointless. Task-number: QTBUG-64664 Change-Id: I5b4803ba49db0ab7e1b4dd632a34d51af59bbf91 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.9.3' into 5.10.0Liang Qi2017-11-211-0/+26
|\ | | | | | | Change-Id: I7b85d1880a9e8da1718cecc813843273115faa70
| * Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-081-0/+26
| | | | | | | | | | | | Change-Id: I0bb47679d9d1985a42ec769f58067e63015fefa3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-202-2/+1
|\ \ | | | | | | | | | Change-Id: I4212b960f262c29cce78cc482ea966d0c0240653
| * | test: enable Tests_TableView::test_resize_columns() on b2qtSami Nurmenniemi2017-11-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Test was fixed by commit c84f7554894cef0cbeeba8a61f441286e190a797 in qtbase. Task-number: QTBUG-64523 Change-Id: I86195fe049c61ceab43566d004c8f6e6bfcee041 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | test: skip Tests_TableView::test_resize_columns() on b2qtLiang Qi2017-11-151-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-64523 Change-Id: Icc369c1933a725321927f46255bb396800a0ac5d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-151-0/+1
| |\ \ | | | | | | | | | | | | Change-Id: I89e5f9b74a7657d315334414ea0447f658024841
| | * | Fix base slider style in static buildsLaszlo Agocs2017-11-141-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid errors like ShaderEffect: Failed to read :/QtQuick/Controls/Shaders/blur.vert in static builds. Task-number: QTBUG-64488 Change-Id: I13b8aa0736db68859e0b4539937952f9c4b5b04b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Doc: Maintain the list of highlighted examples locallyTopi Reinio2017-11-101-0/+2
| | | | | | | | | | | | | | | | | | | | | Previously the list was maintained in qtbase. Change-Id: I0510653c08e2e82f949084c5f0e3b1dcae3a81bf Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* | | Add changes file for Qt 5.10.0Antti Kokko2017-11-101-0/+38
|/ / | | | | | | | | Change-Id: Ia471d106bdd692fc9afce2e7299e541a9da1c2bd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-3011-19/+138
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia33462a31303ae79f7a6ef26dc6065a0afeef3e1
| * Fix outdated FDL license headerKai Koehne2017-10-185-15/+65
| | | | | | | | | | Change-Id: I03c222a72490959d55b3077a6282553a4bfcf7d2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update slider handle position when maximum changesFrederik Gladhorn2017-10-102-3/+16
| | | | | | | | | | | | | | | | | | This is exactly the same as the minimum change, when the maximum is changed, the handle position needs to be re-evaluated. Task-number: QTBUG-63354 Change-Id: I13a67451190a3bb7915afe8e89501097c1dd3301 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+31
| |\ | | | | | | | | | Change-Id: I71761b4cacc29dd6c4890e4b3119c6397b77ca60
| | * Add changes file for Qt 5.9.2v5.9.25.9.2Antti Kokko2017-09-261-0/+31
| | | | | | | | | | | | | | | Change-Id: I1bb0e21414a70bb25e19aa3308cbe29cb6396e76 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: Ibc549b14707e19800e0f586228815e6668fe3110
| * | Add missing stdio.h includeJake Petroules2017-09-281-0/+1
| |/ | | | | | | | | Change-Id: I1fac87fd96898fed487f1621c1d1bdc4c44de1cb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Check for empty style returned from environmentFriedemann Kleint2017-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | Fix warning "Empty filename passed to function" when running Qt Creator 4.4 against Qt 5.10 (see qtbase: 0dee566e98f5ff4f224e596de1c04de4f9685df4). Change-Id: I0b71a873245a28ef972c105e7d41347e6b0fb38a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Add change file for Qt 5.6.3Jani Heikkinen2017-09-011-0/+24
| | | | | | | | | | | | | | Task-number: QTBUG-62702 Change-Id: I023e298c7fc6a64153f374c718d5fce4af98fa78 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Manual test viewinqwidget: Add a TextFieldv5.10.0-beta3Friedemann Kleint2017-10-171-3/+13
| | | | | | | | | | | | | | Allowing for testing menu positioning in addition to combo dropdowns. Change-Id: I0b7ef259a15d8773e82218e1f8a30f15d23e6644 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: add documentation to Dashboard examplev5.10.0-beta2Nico Vertriest2017-10-113-7/+46
| | | | | | | | | | | | Task-number: QTBUG-60648 Change-Id: I79b9fdfde18041d95b7aa422bfb4d188ed907589 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: Maintain the higlighted examples list locallyVenugopal Shivashankar2017-10-051-0/+3
| | | | | | | | | | | | | | | | The list is currently maintained in qtbase. Task-number: QTBUG-60648 Change-Id: I38ff28e52c1274a6cfaae66ef232e482cff38e53 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Add internal types to Android styles qmldirv5.10.0-beta1Eskil Abrahamsen Blomfeldt2017-09-261-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order for types in a module to be available inside the module itself, but not to external types, they need to be marked as internal in the qmldir. This has worked by accident before, but stopped working after 22a2cc43387ec3b9f74a6c01f8665378a4541147 in qtdeclarative, at which point no Qt Quick Controls applications would run on Android. Note that there is also a change needed in qtdeclarative, in order to support implicit loading of internal types even when there is an explicit import of the module (needed to get access to the singleton). Task-number: QTBUG-63309 Change-Id: I36b9ce9fa8f55c4da1f5e64c8fed120e9913bc85 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Add support for the defaultSuffix property in FileDialogAndy Shaw2017-09-176-3/+53
| | | | | | | | | | | | | | | | [ChangeLog][FileDialog] Added defaultSuffix property Task-number: QTBUG-39230 Change-Id: I7dc73c332ad62129d7158b6f6f5a614b8582ffbc Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Example: Update to the new QObject::connect syntaxVenugopal Shivashankar2017-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | The QSortFilterProxyModel-based proxy model forwards the rowsInserted and rowsDeleted signals. Task-number: QTBUG-60631 Change-Id: I51a46cd13a89ea22b8bb4807821b3f21f6893b19 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix tests for boot2qtv5.10.0-alpha1Sami Nurmenniemi2017-08-226-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests for boot2qt were disabled with commit 555750221ee3850ba70169a2b6854041b434c592. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Changes needed: - Using grabImage does not work correctly on offscreen platform, so tests relying on it are skipped - Extra 1ms delay is needed between two mouse clicks to get rid of test_activeFocusOnPress() flakiness on software quick renderer Change-Id: Ie985110c171bc395bac0d63cd2fbb94207c63516 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-221-11/+5
|\ \ | |/ | | | | Change-Id: I6fab4a2531f013291329f2277849f3ef251f0eda
| * tst_menubar: use createTemporaryObject()Mitch Curtis2017-08-221-11/+5
| | | | | | | | | | | | | | | | | | This seems to help get rid of the ApplicationWindows that would otherwise stick around until the end of the controls tests. Change-Id: I0f5cc81e07c727070c3f80654d46881c696eebe7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-153-3/+48
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icfa0daf5e65337745f5986afee7cd3c8043fafa0
| * Calendar: add a doc example that sets minimum/maximumDateMitch Curtis2017-08-111-0/+7
| | | | | | | | | | | | Change-Id: Ie2fb915a927d4c3481afa6e4ac64089440f7ac9c Reviewed-by: Nico Vertriest <nico.vertriest@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+35
| |\ | | | | | | | | | Change-Id: I508a7807a67339c5da9574da4a50ba533c1b9062
| | * Add changes file for 5.9.1v5.9.15.9.1Jani Heikkinen2017-06-231-0/+35
| | | | | | | | | | | | | | | | | | Change-Id: I60762799a0e851a56f557acb6d823c1dfa0b4ec2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | | | | | Change-Id: I330dcde7b04619b285f91aba3258989e9222ff7e
| * | Convert features.tooltip to QT_CONFIGStephan Binner2017-06-271-3/+6
| | | | | | | | | | | | | | | Change-Id: I4638457a51a72666b4c73130f4a856ad93ca2f13 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-2731-226/+454
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie6ad3e9490dcf85bd5deb4c6d7004a4aa8b81433
| * | Increase QtQuick import from 2.2 to 2.6 for QML LabelJussi Witick2017-06-162-1/+12
| |/ | | | | | | | | | | | | | | | | Increase QtQuick import version to 2.6 to enable the properties of underlying QML Text type to be usable in the QML Label type too. Task-number: QTBUG-57895 Change-Id: I7a2b641a56c90ab91b4e6c973278d8943fa6903a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix support for using QtQuick Dialogs with the QML compilerSimon Hausmann2017-06-011-6/+9
| | | | | | | | | | | | | | | | | | | | This is a regression from commit dacb91916b202208681471ba764504c7c7d086f0. Make sure to include the dialogs sources in the resource system when using the compiler. Task-number: QTBUG-60991 Change-Id: I35c3e2e677e4f44ec56fe02b086ce08a8b765d37 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Support for Q_OS_ANDROID_EMBEDDED and android-embedded buildsOtto Ryynänen2017-06-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: Ic825e034f8d4b39c45e03b9f0a965f126559991e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * remove bogus QTPLUGIN+=qsqlite magicOswald Buddenhagen2017-05-291-2/+0
| | | | | | | | | | | | | | | | | | | | the code was originally meant to link the plugin if it's not built into qtsql. this logic did not survive the various build system refactorings, but it's also entirely pointless, because available static plugins are now automatically linked. Change-Id: I85039dbb123ab4fa1089b898041ab6d3ddb2e44c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update plugins.qmltypesMitch Curtis2017-05-291-116/+165
| | | | | | | | | | Change-Id: I90f9118e7e9a9b5ffcc9cba8909ff2cf3dd1e166 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Add benchmark to measure start-up time of complex QML applicationErik Verbruggen2017-05-245-1/+131
| | | | | | | | | | | | | | | | This is not an automated benchmark, it is meant to be run manually or by a script. Change-Id: I72a4c15120ff4a650fb4bd2f90c6db1907dba994 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Simon Hausmann2017-05-232-27/+61
| |\ | | | | | | | | | Change-Id: I67b3761e42ad377d090a9dd20ad6309bd72c5484
| | * Fix inclusion of QML files of the Dialogs module in static buildsv5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Simon Hausmann2017-05-221-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a regression introduce by commit 751f08cf46f505980b8ebe9a228a6c229b470152. For a build with QML Ahead-of-Time cache creation, we need the qml files in QML_FILES and qml_module.prf takes care of installing them correctly into the file system (caches and sources). For a static build we also need the sources in QML_FILES, in order for their automatic inclusion in the resource system (also by qml_module.prf). Task-number: QTBUG-60861 Change-Id: Id9125530d8b385101994600c1224dbcb2a5333f9 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Add changes file for 5.9.0Antti Kokko2017-05-111-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: I03a78d6777d3a3a9cec345baf41b095134bdd126 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | SpinBox: set "editable" accessible propertyJ-P Nurmi2017-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Because we want to make QQuickItemPrivate::canAcceptTabFocus() respect non-editable SpinBoxes (available in QQC2). Change-Id: If2bc2707c448203a2105ddc4de10ac1566818e00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * | Mark both benchmarks as such in the pro filesErik Verbruggen2017-05-122-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This enables them to be run with "make benchmark" Change-Id: I13ecd96087dd6586a47fb2abab269982f04803db Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | | | | | Change-Id: I0c6bfc205526ccdb6f80695b0d1dfdf7c7397afa
| * | Slider: Don't suppress updates by dragThreshold on non-touchscreensUlf Hermann2017-05-102-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | When using a mouse, you want a slider to react immediately to input, not only if you move beyond a certain threshold. With the threshold it is very hard to accurately position the slider. On touchscreens, the threshold is necessary to allow for unrelated events, like flicking views, to not interfere with the value. Change-Id: I6cb8252338f20de559e062e738118593ffc1e099 Task-number: QTBUG-47081 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * texteditor example: Fix path to editpaste iconv5.9.0-beta4Friedemann Kleint2017-05-041-1/+1
| | | | | | | | | | | | | | | | | | Drop prefix so that it can be found from either resources or files. Change-Id: Ib9dcab86f22bff0f8a3d7f0f22aa35d717b3569f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Disable/blacklist failing tests for boot2qtSami Nurmenniemi2017-05-021-0/+3
| | | | | | | | | | | | | | | | | | Currently boot2qt is tested with QEMU and some tests fail. Disabling them for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: Ifabc4c4b93beda1990fc4f4d6e254dcd704f93fc Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
View Lorry Controller Status