diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-29 16:02:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 18:16:48 +0100 |
| commit | a6065d60f158ffad7a94877883af69731da94295 (patch) | |
| tree | 5657fd490fd8a3f9794a8c9bcc9f85cf24a095c1 /examples/quick/modelviews | |
| parent | c18e04b2e61f174a4883f6884cf9a0712c5725e3 (diff) | |
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>
Diffstat (limited to 'examples/quick/modelviews')
| -rw-r--r-- | examples/quick/modelviews/browser.prx | 18 | ||||
| -rw-r--r-- | examples/quick/modelviews/main.cpp | 2 | ||||
| -rw-r--r-- | examples/quick/modelviews/modelviews.pro | 25 | ||||
| -rw-r--r-- | examples/quick/modelviews/modelviews.qml | 2 |
4 files changed, 27 insertions, 20 deletions
diff --git a/examples/quick/modelviews/browser.prx b/examples/quick/modelviews/browser.prx new file mode 100644 index 0000000000..e9beacf0fb --- /dev/null +++ b/examples/quick/modelviews/browser.prx @@ -0,0 +1,18 @@ +TEMPLATE = app +TARGET = modelviews + +QT += quick qml +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/modelviews +qml.files = \ + modelviews.qml \ + gridview \ + listview \ + package \ + parallax \ + pathview \ + visualdatamodel \ + visualitemmodel +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/modelviews +INSTALLS += target qml diff --git a/examples/quick/modelviews/main.cpp b/examples/quick/modelviews/main.cpp index 082001cad2..84d52cbc12 100644 --- a/examples/quick/modelviews/main.cpp +++ b/examples/quick/modelviews/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(modelviews) diff --git a/examples/quick/modelviews/modelviews.pro b/examples/quick/modelviews/modelviews.pro index 695c010263..101408f28d 100644 --- a/examples/quick/modelviews/modelviews.pro +++ b/examples/quick/modelviews/modelviews.pro @@ -1,19 +1,8 @@ -TEMPLATE = app +TEMPLATE = subdirs -QT += quick qml -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/modelviews -qml.files = \ - modelviews.qml \ - gridview \ - listview \ - package \ - parallax \ - pathview \ - visualdatamodel \ - visualitemmodel -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/modelviews -sources.files = $$SOURCES modelviews.pro -sources.path = $$qml.path -INSTALLS += sources target qml +browser.file = browser.prx +SUBDIRS = \ + browser \ +# abstractitemmodel \ # Does not build + objectlistmodel \ + stringlistmodel diff --git a/examples/quick/modelviews/modelviews.qml b/examples/quick/modelviews/modelviews.qml index d86bbf3416..2df91db7ff 100644 --- a/examples/quick/modelviews/modelviews.qml +++ b/examples/quick/modelviews/modelviews.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" as Examples +import "../shared" as Examples Item { height: 480 |