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>
|
@ -1,3 +1,3 @@
|
||||||
TEMPLATE = subdirs
|
TEMPLATE = subdirs
|
||||||
SUBDIRS += \
|
SUBDIRS += \
|
||||||
controls
|
quickcontrols2
|
||||||
|
|
|
@ -11,5 +11,5 @@ OTHER_FILES += \
|
||||||
RESOURCES += \
|
RESOURCES += \
|
||||||
gallery.qrc
|
gallery.qrc
|
||||||
|
|
||||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtlabscontrols/gallery
|
target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/gallery
|
||||||
INSTALLS += target
|
INSTALLS += target
|
Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 352 B |
Before Width: | Height: | Size: 524 B After Width: | Height: | Size: 524 B |
Before Width: | Height: | Size: 719 B After Width: | Height: | Size: 719 B |
Before Width: | Height: | Size: 922 B After Width: | Height: | Size: 922 B |
Before Width: | Height: | Size: 429 B After Width: | Height: | Size: 429 B |
Before Width: | Height: | Size: 663 B After Width: | Height: | Size: 663 B |
Before Width: | Height: | Size: 943 B After Width: | Height: | Size: 943 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 123 B After Width: | Height: | Size: 123 B |
Before Width: | Height: | Size: 126 B After Width: | Height: | Size: 126 B |
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 130 B |
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 131 B |
Before Width: | Height: | Size: 123 B After Width: | Height: | Size: 123 B |
Before Width: | Height: | Size: 158 B After Width: | Height: | Size: 158 B |
Before Width: | Height: | Size: 193 B After Width: | Height: | Size: 193 B |
Before Width: | Height: | Size: 223 B After Width: | Height: | Size: 223 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
@ -28,14 +28,14 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquicklayouts qtquickdialogs qtquick
|
||||||
# Specify the install path under QT_INSTALL_EXAMPLES
|
# Specify the install path under QT_INSTALL_EXAMPLES
|
||||||
# Note: paths passed to \example command must contain the parent directory, e.g.
|
# Note: paths passed to \example command must contain the parent directory, e.g.
|
||||||
# \example controls/tabs
|
# \example controls/tabs
|
||||||
exampledirs += ../../../../examples/controls \
|
exampledirs += ../../../../examples/quickcontrols2 \
|
||||||
../ \
|
../ \
|
||||||
../../../templates \
|
../../../templates \
|
||||||
../../calendar \
|
../../calendar \
|
||||||
../../../../tests/auto/controls/data \
|
../../../../tests/auto/controls/data \
|
||||||
snippets
|
snippets
|
||||||
|
|
||||||
examplesinstallpath = qtquickcontrols2/controls
|
examplesinstallpath = qtquickcontrols2/quickcontrols2
|
||||||
|
|
||||||
headerdirs += ../../../templates \
|
headerdirs += ../../../templates \
|
||||||
../../calendar \
|
../../calendar \
|
||||||
|
|