Commit Graph

21 Commits

Author SHA1 Message Date
Eskil Abrahamsen Blomfeldt cb907fc47a Move Qt Quick Shapes examples back under Qt Quick
In order to be accessible from Qt Creator, the modules either has
to have a separate landing page and qdocconf, or we need it under
the same subdirectory as everything else. We currently want
Qt Quick Shapes to be like Qt Quick Particles and be documented
as part of Qt Quick, so the examples move back into a quickshapes/
subdirectory of examples/quick (like with examples/quick/particles/)

Pick-to: 6.7
Change-Id: Ib7aaa75da7c4c9eeca6edb5ede7952598f37df89
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2024-02-01 21:42:00 +01:00
Eskil Abrahamsen Blomfeldt 5e8314f472 Move Qt Quick Shapes example
Usually, we have separate top-level example directories for
different modules, but since Qt Quick Shapes only had a single
example, it was categorized under examples/quick.

We now plan to add more, so to prepare for that, this sets up
the normal structure with an examples/quickshapes directory.

Pick-to: 6.7
Change-Id: I50016358b674c18bb2930459d4e0111862ddcedb
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2024-01-06 11:19:17 +01:00
Lucie Gérard 877c907765 Move undocumented qmltest example to tests/manual
Task-number: QTBUG-119117
Change-Id: I92cd8c754f9442a8efb3e0dd2b4b791010cacc7c
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2023-11-22 08:23:59 +01:00
Joerg Bornemann 9fb766ecd0 qmake: Fix build of quickcontrols examples
The QuickControls2 module has been moved to src/quickcontrols. Its
examples are in examples/quickcontrols.

Adjust the .pro file name in examples/quickcontrols and fix the SUBDIRS
entry to it.

This amends commit 4bd87b903b.

Pick-to: 6.5
Task-number: QTBUG-109383
Change-Id: I9de70a773a11344398c01b3e84e557213268c935
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-12-14 17:39:55 +01:00
Mitch Curtis 16436239cd Merge qtquickcontrols2 into qtdeclarative
Task-number: QTBUG-95173
Change-Id: I2cf31e30127e8cc2f10304cabf4ff7f5050633b8
2021-07-28 11:21:25 +02:00
Mitch Curtis 1cb0faf788 Flatten and rename example install path and directory structure
Change-Id: Ib04e79d72c37fa4507517da2d3b1c28ccd73eaed
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
2016-04-19 12:27:35 +00:00
J-P Nurmi 5805fa6ade Add Gallery example
Task-number: QTBUG-49941
Change-Id: I7bd6b25e12a6e90ba637231790b9a2c7a92bb821
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-17 18:47:27 +00:00
Mitch Curtis 94d33a6875 Remove all examples
The current examples were temporary until we started working on proper
ones, which we've recently begun doing.

Change-Id: I418e5e9604f0b57a33b56dc3aa6ec1cba5c3f791
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-27 11:36:53 +00:00
J-P Nurmi 3f2ac67897 Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0
Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-10-01 09:03:42 +00:00
J-P Nurmi 98e7b3cca4 Rename QtQuick.Calendar 2.0 to Qt.labs.calendar 1.0
Change-Id: Ief7e28f6c595cb60f15a4960dada24a6c2f5ca3e
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-10-01 09:03:34 +00:00
J-P Nurmi 8b2a1ec431 Import the Qt Quick Controls 2 prototype
Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
2015-02-05 14:50:29 +02:00
Samuel Rødal 3598931461 Fixed build when Qt is configured with -no-opengl.
Task-number: QTBUG-28849
Change-Id: I331ebca76892ce7ffbc6f8e03ff4afe0c8e28d5e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-02-20 08:52:28 +01:00
Oswald Buddenhagen a6065d60f1 centralize and fixup example sources install targets
follow respective change in qtbase

Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
2012-12-10 18:16:48 +01:00
Christian Kandeler aba67cc3f0 Fix installation of examples.
Enable examples to be built in the target tree. This entails installing
the project files and possibly other missing stuff.
Task-number: QTBUG-27977

Change-Id: I159fd8e3ebc7077e1d68e085c4947acc058ce594
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-22 14:10:05 +01:00
Oswald Buddenhagen fe5e731560 remove pointless qmltest conditionals
it is a module within this repository, and consequently the flag is
always set.

Change-Id: I8ffdd6903b1b0835725b824a9deb961d0124ce11
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-06-26 14:58:33 +02:00
Matthew Vogt 0284817d6c Merge master <-> api_changes
Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
2012-03-05 11:39:54 +10:00
Alan Alpert 9d2b618fa0 Start of examples refactor
This is the general reorg of the examples directory structure, plus additional
guidelines.

calculator, animations and accessibility have been updated to the new standards
and tested, as an example.

Task-number: QTBUG-24133
Change-Id: I76c3b86751d3195ba2a5474ff23afb875765e9a4
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-02-24 10:24:58 +01:00
Matthew Vogt b855240b78 Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.

Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.

Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-24 04:51:31 +01:00
Alan Alpert 5b949572aa Have tutorial built along with other examples
Change-Id: I9f64659ca1621a5fea8e9013ecd264d971207d4d
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2011-12-01 02:40:06 +01:00
Charles Yin daf671b422 Integrate QtQuickTest into Qt
Change-Id: I558821c0dec9166ea1d0d2e1e2f889553c436316
Task-number:QTBUG-16082
2011-05-20 12:07:23 +10:00
Qt by Nokia 885735d011 Initial import from the monolithic Qt.
This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 12:05:43 +02:00