summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-201-0/+1
|\ | | | | | | Change-Id: I4212b960f262c29cce78cc482ea966d0c0240653
| * 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>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-302-3/+3
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia33462a31303ae79f7a6ef26dc6065a0afeef3e1
| * Update slider handle position when maximum changesFrederik Gladhorn2017-10-101-2/+2
| | | | | | | | | | | | | | | | | | 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>
| * 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>
* | Doc: add documentation to Dashboard examplev5.10.0-beta2Nico Vertriest2017-10-111-1/+36
| | | | | | | | | | | | 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-175-3/+30
| | | | | | | | | | | | | | | | [ChangeLog][FileDialog] Added defaultSuffix property Task-number: QTBUG-39230 Change-Id: I7dc73c332ad62129d7158b6f6f5a614b8582ffbc Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-152-3/+13
|\ \ | |/ | | | | | | | | | | 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>
| * 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-2717-215/+240
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie6ad3e9490dcf85bd5deb4c6d7004a4aa8b81433
| * Increase QtQuick import from 2.2 to 2.6 for QML LabelJussi Witick2017-06-161-1/+1
| | | | | | | | | | | | | | | | | | 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>
| * Update plugins.qmltypesMitch Curtis2017-05-291-116/+165
| | | | | | | | | | Change-Id: I90f9118e7e9a9b5ffcc9cba8909ff2cf3dd1e166 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Simon Hausmann2017-05-231-27/+1
| |\ | | | | | | | | | 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>
| * | 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>
| * | Slider: Don't suppress updates by dragThreshold on non-touchscreensUlf Hermann2017-05-101-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | 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>
| * Fix non-prefix builds on WindowsSimon Hausmann2017-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | After commit 3ba11cf93820610273e2a16b13ab1d8c57a41d36 the shaders do not belong into QML_FILES anymore (and also don't need to be copied via COPIES consequently). Task-number: QTBUG-60214 Change-Id: I8d68fe76810c2d2d8945ef410a377aa2ce0068c1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Fix packaging of shaders when qmlcache is usedJoni Poikelin2017-04-241-23/+7
| | | | | | | | | | | | | | Task-number: QTBUG-60320 Change-Id: Iac74b469e971d28218fd35eadefb3c3b4bca4e51 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-184-7/+39
| |\ | | | | | | | | | Change-Id: Ife389a8fd4df1eef4f521ff734d02748b25ec184
| | * Add NOTIFY signals for WheelArea5.8Marco Martin2017-04-033-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the private WheelArea component didn't have any notify signals in its horizontalValue/verticalValue or minimum/maximum values as well. this caused old values to be used in ScrollView.qml. If we want to have a listView that starts scrolled right when instanced, verticalMaximumValue won't be updated when the list is populated. Also, the wheelArea.verticalValue that's assigned at the beginning will be constrained by the wrong verticalMaximumValue, causing it to go out of sync with contentY. At this point the first time the mouse wheel is moved, the list will jump back at the top. Change-Id: I4605000636be7975ba9a58e2c79e8c2351e5a292 Task-number: QTBUG-59633 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | * Fix "Unable to assign Object to QString" warningJason Erb2017-03-111-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ic219be7b90cbcde8fcc6a2e4d4a598a5d38b1d47 Task-number: QTBUG-47539 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Connect to QQuickWindow::visibleChanged using QObject member syntaxTor Arne Vestbø2017-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To disambiguate from QWindow::visibleChanged. Otherwise we get a warning at runtime: QMetaObject::indexOfSignal: signal visibleChanged(bool) from QQuickWindow redefined in QQuickWindowQmlImpl Change-Id: I95f984cface59cd7ec5710235959a1054b26275a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | Enable the use of QML caching at build timev5.9.0-beta2Simon Hausmann2017-04-113-5/+15
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-58571 Change-Id: I11c9dfb4e0fad93b2961db4213f934eca7d214df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Remove qrc based default qml distribution for QQC extrasSimon Hausmann2017-04-033-25/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is consistent with the other modules and prepares for the use of qml caching. Change-Id: Ifab9187ac60a52d0464c5afe46772a9da1489c73 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Remove spurious Q_INIT_RESOURCE callsSimon Hausmann2017-04-033-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | These explicit resource initialization calls are only needed when linking statically. Change-Id: I5518e1b32d4fc7c1d03d35dd15bf3ce65d5eafcf Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Calendar: make locale property publicMitch Curtis2017-06-165-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful to set a locale on a specific calendar, as opposed to using the application-wide default. plugins.qmltypes was also updated. [ChangeLog][Calendar] Added locale property, which affects which day is shown as the first day of the week, as well as date and day name localization. Task-number: QTBUG-60217 Change-Id: I113298a3f3b6dd407d26f3f55ed6973e73ab6a4c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-3121-41/+161
|\ \ \ | |/ / | | | | | | Change-Id: Ia574913a1c2af6349db33966c172e96f6eb5f127
| * | Fix warnings for -no-feature-itemviewsv5.9.0-beta1Nikita Krupenko2017-03-291-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: I4dcca848212d6aed403bbed1a8b484ab269b3e47 Reviewed-by: Stephan Binner <stephan.binner@basyskom.com> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * | Fix build with -no-feature-libraryPaul Olav Tvete2017-03-201-0/+2
| | | | | | | | | | | | | | | Change-Id: I310e90ec92b81939df11accb4cb6b1bd25df472e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Take enabled property into account when styling MenuBar itemTuomas Vaarala2017-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the MenuBar item's property enabled is set as false: - Gray out the MenuBar item text. - Disable the blue highlighting of item when selected. Task-number: QTBUG-59335 Change-Id: I2fb0eb5539bdeaf487f0fc5d499ace72e6c916b7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-101-0/+2
| |\ \ | | |/ | | | | | | Change-Id: Iaceb3ddf7d7314d43309a60967e93132954b230a
| | * Prevent wheel events from escaping SliderJason Erb2017-03-021-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-42273 Change-Id: I31e77cbb5a149ad160f806529140165baf48c8ac Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Build fix for -no-feature-libraryPaul Olav Tvete2017-03-031-2/+3
| | | | | | | | | | | | | | | Change-Id: I9339b134c8025e9f3e44933121e339a3107ad975 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Build fix for -no-feature-validatorPaul Olav Tvete2017-03-033-0/+9
| | | | | | | | | | | | | | | Change-Id: Ib5c89c0934d5dbf2fe31c9ced09998c8a7405801 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Build fix for -no-feature-shortcutPaul Olav Tvete2017-03-032-0/+14
| | | | | | | | | | | | | | | Change-Id: I63f1990f72d0eb736c5e1ecba5574bb13f9ef127 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Build fix for -no-feature-regularexpressionPaul Olav Tvete2017-03-031-0/+2
| | | | | | | | | | | | | | | Change-Id: I211a325b0bd5fb1e5d48b1d378cdce39acb84c96 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Build fix for various widget featuresPaul Olav Tvete2017-03-032-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | Make QtQuickControls build with -no-feature-spinbox, textedit, toolbar, itemviews, wheelevent, tabbar, tabwidget and slider. Change-Id: I780df0f624e885be03307908d4133d4ab91f8bea Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Build fix for -no-feature-picturePaul Olav Tvete2017-03-033-0/+9
| | | | | | | | | | | | | | | Change-Id: I4ace999ad45dc299a9a0d9b24c87823c762f3821 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Merge remote-tracking branch 'qt/5.8' into 5.9Paul Olav Tvete2017-03-024-20/+58
| |\ \ | | |/ | | | | | | Change-Id: Ia4337204f3b69d63eb50d1b918685b098c77b48d
| | * Made Button accept space key press and release eventsJason Erb2017-02-101-1/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-57853 Change-Id: I33cd09d78e470a85d0f816781e683b7574f673ab Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Fix feature dependenciesPaul Olav Tvete2017-02-063-19/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | Build with -no-feature-filedialog, -no-feature-messagebox, -no-feature-colordialog, and -no-feature-fontdialog Change-Id: I0d63451a546014400f051645460a1fc1362eb753 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | "to the empty string" => "to an empty string"Mitch Curtis2017-03-013-10/+10
| | | | | | | | | | | | | | | | | | Change-Id: I62f1fae431ce02c196c6ca582e0d033dbf38d836 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Note that iconName requires QApplicationMitch Curtis2017-03-014-0/+9
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-37083 Change-Id: I3091776f4b4643136e67c9521efddb5462657d06 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
View Lorry Controller Status