Commit Graph

18 Commits

Author SHA1 Message Date
Mitch Curtis d451cab0c8 Remove all version numbers from QML imports
As of Qt 6, the latest version will be used by default. This saves us a
lot of effort in terms of version bumps.

Task-number: QTBUG-82922
Change-Id: I74eba8185ec3ccc75bc293d4b2ea87d59e2d9928
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-08-26 11:46:00 +02:00
Mitch Curtis 0e18524a84 Remove Qt Labs Calendar
This is getting its own repository as part of the move to the
marketplace.

Task-number: QTBUG-84172
Pick-to: 5.15
Change-Id: I2f963c298d6ef95e0832f95aa1e1ea809f4867a2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-05-28 08:09:33 +02:00
Mitch Curtis 456d26e97e Remove bindings to parent in delegates
Until we've decided whether to a) document that properties of parent
should not be bound to in delegates or b) fix the warning that results
from doing so after 8c72e634b3,
we can pre-emptively clean up a few places where it happens.

Task-number: QTBUG-81976
Task-number: QTBUG-82393
Task-number: QTBUG-82989
Pick-to: 5.15
Change-Id: I1e610613f6016ec1b9cf9ca33cdfb15d384731a8
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-05-11 15:57:59 +02:00
Alexandru Croitor 5e6bf7e22e Regenerate projects to be in sync
Change-Id: I3a57449c9025e22414b8337fcffdeb0f4d769af2
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-15 12:22:59 +00:00
Alexandru Croitor 718e08392f Regenerate examples
Change-Id: I8a55e330f8f251df1498f1b906d25b3311f5fd70
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-11 11:47:43 +00:00
Leander Beernaert 833d8c305b Conversion of QtQuickControls2 examples
Initial Conversion of QtQuickControls2 examples.

Change-Id: I21ddf792d039dc26e4ba58d8592101eb131618d3
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-10-08 16:25:53 +00:00
Mitch Curtis 3c7bfc1567 Tie minor version of all imports to Qt's minor version
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>
2018-11-02 16:45:04 +00:00
Kevin Funk fb3e0ab4ef Replace Q_DECL_OVERRIDE with override
Change-Id: Ib7dc6679748dc6c88f7bad3896b2e2e3b048c987
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-09-22 14:31:26 +00:00
Venugopal Shivashankar 815cae4eb4 Example: Replace spaces from the image file name
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>
2017-07-10 07:37:11 +00:00
Oswald Buddenhagen acedf3ade8 remove bogus QTPLUGIN+=qsqlite magic
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>
2017-05-29 17:55:11 +00:00
J-P Nurmi 51240b75cc Update license headers to silence qtqa/tst_license warnings
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>
2017-02-24 13:04:52 +00:00
J-P Nurmi 00a062649b Welcome to 2017
Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-01-09 17:29:40 +00:00
Lars Knoll c49b1ff158 Fix sqlite detection
There is now a sql-sqlite feature in qtbase that should get used.

Change-Id: I92eb47c292b13ca639fd808b397e25f8358d2e96
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-12 11:52:51 +00:00
J-P Nurmi 7af626e08c Bump up all controls and templates imports to version 2.1
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>
2016-07-08 07:37:33 +00:00
J-P Nurmi 1ef2c051ec import Qt.labs.controls 1.0 => QtQuick.Controls 2.0
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>
2016-04-21 15:48:05 +00:00
J-P Nurmi 0cf1038aa7 Chat Tutorial: update the install path
Change-Id: Ib4bd465d6c5d2f81f7dcce2f3eb547fe1cdc2360
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-04-21 05:43:27 +00:00
J-P Nurmi e358a033d4 Rename qtquickcontrols.conf to qtquickcontrols2.conf
Use the 2-suffix consistently everywhere to avoid any potential
confusion with the old controls.

Change-Id: I83aa212a15ed78b8694fb7d3db80fc8430aea969
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-04-21 05:43:19 +00:00
J-P Nurmi e8cd9c0458 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb
2016-04-20 16:23:33 +02:00