Update views example to use modules
The qmake and qmlproject files are adapted to use the "shared" module, too. Pick-to: 6.2 Change-Id: I5fc4895416357ba202528b155581b1b5a880a68d Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Ulf Hermann
parent
7b6eea37ae
commit
cb9cc7ca66
|
|
@ -59,6 +59,7 @@
|
|||
app.setOrganizationDomain("qt-project.org");\
|
||||
app.setApplicationName(QFileInfo(app.applicationFilePath()).baseName());\
|
||||
QQuickView view;\
|
||||
view.engine()->addImportPath(QStringLiteral(":/"));\
|
||||
if (qEnvironmentVariableIntValue("QT_QUICK_CORE_PROFILE")) {\
|
||||
QSurfaceFormat f = view.format();\
|
||||
f.setProfile(QSurfaceFormat::CoreProfile);\
|
||||
|
|
|
|||
|
|
@ -20,105 +20,77 @@ find_package(Qt6 COMPONENTS Gui)
|
|||
find_package(Qt6 COMPONENTS Quick)
|
||||
find_package(Qt6 COMPONENTS Qml)
|
||||
|
||||
qt_add_executable(views
|
||||
add_subdirectory("../shared" "shared")
|
||||
|
||||
qt_add_executable(viewsexample
|
||||
main.cpp
|
||||
)
|
||||
set_target_properties(views PROPERTIES
|
||||
set_target_properties(viewsexample PROPERTIES
|
||||
WIN32_EXECUTABLE TRUE
|
||||
MACOSX_BUNDLE TRUE
|
||||
)
|
||||
target_link_libraries(views PUBLIC
|
||||
target_link_libraries(viewsexample PRIVATE
|
||||
Qt::Core
|
||||
Qt::Gui
|
||||
Qt::Qml
|
||||
Qt::Quick
|
||||
views_shared
|
||||
)
|
||||
|
||||
|
||||
# Resources:
|
||||
set(views_resource_files
|
||||
"delegatemodel/dragselection.qml"
|
||||
"delegatemodel/slideshow.qml"
|
||||
"gridview/gridview-example.qml"
|
||||
"gridview/pics/AddressBook_48.png"
|
||||
"gridview/pics/AudioPlayer_48.png"
|
||||
"gridview/pics/Camera_48.png"
|
||||
"gridview/pics/DateBook_48.png"
|
||||
"gridview/pics/EMail_48.png"
|
||||
"gridview/pics/TodoList_48.png"
|
||||
"gridview/pics/VideoPlayer_48.png"
|
||||
"listview/content/PetsModel.qml"
|
||||
"listview/content/PressAndHoldButton.qml"
|
||||
"listview/content/RecipesModel.qml"
|
||||
"listview/content/SmallText.qml"
|
||||
"listview/content/TextButton.qml"
|
||||
"listview/content/ToggleButton.qml"
|
||||
"listview/content/pics/arrow-down.png"
|
||||
"listview/content/pics/arrow-up.png"
|
||||
"listview/content/pics/fruit-salad.jpg"
|
||||
"listview/content/pics/hamburger.jpg"
|
||||
"listview/content/pics/lemonade.jpg"
|
||||
"listview/content/pics/list-delete.png"
|
||||
"listview/content/pics/minus-sign.png"
|
||||
"listview/content/pics/moreDown.png"
|
||||
"listview/content/pics/moreUp.png"
|
||||
"listview/content/pics/pancakes.jpg"
|
||||
"listview/content/pics/plus-sign.png"
|
||||
"listview/content/pics/vegetable-soup.jpg"
|
||||
"listview/displaymargin.qml"
|
||||
"listview/dynamiclist.qml"
|
||||
"listview/expandingdelegates.qml"
|
||||
"listview/highlight.qml"
|
||||
"listview/highlightranges.qml"
|
||||
"listview/sections.qml"
|
||||
"objectmodel/objectmodel.qml"
|
||||
"package/Delegate.qml"
|
||||
"package/view.qml"
|
||||
"pathview/pathview-example.qml"
|
||||
"pathview/pics/AddressBook_48.png"
|
||||
"pathview/pics/AudioPlayer_48.png"
|
||||
"pathview/pics/Camera_48.png"
|
||||
"pathview/pics/DateBook_48.png"
|
||||
"pathview/pics/EMail_48.png"
|
||||
"pathview/pics/TodoList_48.png"
|
||||
"pathview/pics/VideoPlayer_48.png"
|
||||
"views.qml"
|
||||
qt_add_qml_module(viewsexample
|
||||
URI views
|
||||
VERSION 1.0
|
||||
QML_FILES
|
||||
"delegatemodel/dragselection.qml"
|
||||
"delegatemodel/slideshow.qml"
|
||||
"gridview/gridview-example.qml"
|
||||
"listview/content/PetsModel.qml"
|
||||
"listview/content/PressAndHoldButton.qml"
|
||||
"listview/content/RecipesModel.qml"
|
||||
"listview/content/SmallText.qml"
|
||||
"listview/content/TextButton.qml"
|
||||
"listview/content/ToggleButton.qml"
|
||||
"listview/displaymargin.qml"
|
||||
"listview/dynamiclist.qml"
|
||||
"listview/expandingdelegates.qml"
|
||||
"listview/highlight.qml"
|
||||
"listview/highlightranges.qml"
|
||||
"listview/sections.qml"
|
||||
"objectmodel/objectmodel.qml"
|
||||
"package/Delegate.qml"
|
||||
"package/view.qml"
|
||||
"pathview/pathview-example.qml"
|
||||
"views.qml"
|
||||
RESOURCES
|
||||
"gridview/pics/AddressBook_48.png"
|
||||
"gridview/pics/AudioPlayer_48.png"
|
||||
"gridview/pics/Camera_48.png"
|
||||
"gridview/pics/DateBook_48.png"
|
||||
"gridview/pics/EMail_48.png"
|
||||
"gridview/pics/TodoList_48.png"
|
||||
"gridview/pics/VideoPlayer_48.png"
|
||||
"listview/content/pics/arrow-down.png"
|
||||
"listview/content/pics/arrow-up.png"
|
||||
"listview/content/pics/fruit-salad.jpg"
|
||||
"listview/content/pics/hamburger.jpg"
|
||||
"listview/content/pics/lemonade.jpg"
|
||||
"listview/content/pics/list-delete.png"
|
||||
"listview/content/pics/minus-sign.png"
|
||||
"listview/content/pics/moreDown.png"
|
||||
"listview/content/pics/moreUp.png"
|
||||
"listview/content/pics/pancakes.jpg"
|
||||
"listview/content/pics/plus-sign.png"
|
||||
"listview/content/pics/vegetable-soup.jpg"
|
||||
"pathview/pics/AddressBook_48.png"
|
||||
"pathview/pics/AudioPlayer_48.png"
|
||||
"pathview/pics/Camera_48.png"
|
||||
"pathview/pics/DateBook_48.png"
|
||||
"pathview/pics/EMail_48.png"
|
||||
"pathview/pics/TodoList_48.png"
|
||||
"pathview/pics/VideoPlayer_48.png"
|
||||
)
|
||||
|
||||
qt6_add_resources(views "views"
|
||||
PREFIX
|
||||
"/views"
|
||||
FILES
|
||||
${views_resource_files}
|
||||
)
|
||||
set(shared_resource_files
|
||||
"../shared/Button.qml"
|
||||
"../shared/CheckBox.qml"
|
||||
"../shared/FlickrRssModel.qml"
|
||||
"../shared/Label.qml"
|
||||
"../shared/LauncherList.qml"
|
||||
"../shared/SimpleLauncherDelegate.qml"
|
||||
"../shared/Slider.qml"
|
||||
"../shared/TabSet.qml"
|
||||
"../shared/TextField.qml"
|
||||
"../shared/images/back.png"
|
||||
"../shared/images/checkmark.png"
|
||||
"../shared/images/next.png"
|
||||
"../shared/images/qt-logo.png"
|
||||
"../shared/images/slider_handle.png"
|
||||
"../shared/images/tab.png"
|
||||
)
|
||||
|
||||
qt6_add_resources(views "shared"
|
||||
PREFIX
|
||||
"/shared"
|
||||
BASE
|
||||
"../shared"
|
||||
FILES
|
||||
${shared_resource_files}
|
||||
)
|
||||
|
||||
install(TARGETS views
|
||||
install(TARGETS viewsexample
|
||||
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
|
||||
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
|
||||
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
import QmlProject 1.0
|
||||
|
||||
Project {
|
||||
mainFile: "slideshow.qml"
|
||||
importPaths: [ "../../" ]
|
||||
|
||||
/* Include .qml, .js, and image files from current directory and subdirectories */
|
||||
QmlFiles {
|
||||
directory: "."
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
|
||||
import QtQuick 2.12
|
||||
import QtQml.Models 2.12
|
||||
import "../../shared" as Shared
|
||||
import shared as Shared
|
||||
|
||||
Rectangle {
|
||||
id: root
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@
|
|||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.0
|
||||
import "../shared" as Examples
|
||||
import QtQuick
|
||||
import shared as Examples
|
||||
|
||||
Item {
|
||||
height: 480
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import QmlProject 1.1
|
|||
|
||||
Project {
|
||||
mainFile: "views.qml"
|
||||
importPaths: [ "../" ]
|
||||
|
||||
/* Include .qml, .js, and image files from current directory and subdirectories */
|
||||
QmlFiles {
|
||||
|
|
|
|||
Loading…
Reference in New Issue