aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols2/chattutorial/chapter4-models
Commit message (Collapse)AuthorAgeFilesLines
* Tie minor version of all imports to Qt's minor versionMitch Curtis2018-11-023-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-2/+2
| | | | | Change-Id: Ib7dc6679748dc6c88f7bad3896b2e2e3b048c987 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Example: Replace spaces from the image file nameVenugopal Shivashankar2017-07-102-2/+2
| | | | | | | | | | Updated the corresponding qml files where these images are used. The spaces in file name stops qdoc from listing the file in the example page. Change-Id: I45b24ec88d367fe229fe365eeb611b86de805e0d Reviewed-by: Mitch Curtis <mitch.curtis@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: If4b5bb3387f21aef98aa55257dd5b94f953822c5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-248-16/+96
| | | | | | | | | | Sync with the qtbase/header.XXX. The license headers were matching qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings: Old license being used for foo.qdoc Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Welcome to 2017J-P Nurmi2017-01-098-8/+8
| | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix sqlite detectionLars Knoll2016-09-121-1/+1
| | | | | | | There is now a sql-sqlite feature in qtbase that should get used. Change-Id: I92eb47c292b13ca639fd808b397e25f8358d2e96 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Bump up all controls and templates imports to version 2.1J-P Nurmi2016-07-083-3/+3
| | | | | | | | | | | | Controls must import templates version 2.1 in order to "inherit" 1-revisioned properties, methods, and signals. So far, this has been done case by case, but it's less error prone and more clear to change them all. For example, if you ever see a source file pasted/linked somewhere, it's easy to identify the version it belongs to. Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* import Qt.labs.controls 1.0 => QtQuick.Controls 2.0J-P Nurmi2016-04-213-3/+3
| | | | | | | | | Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Chat Tutorial: update the install pathJ-P Nurmi2016-04-211-1/+1
| | | | | Change-Id: Ib4bd465d6c5d2f81f7dcce2f3eb547fe1cdc2360 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-04-2010-0/+753
Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb