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/text | |
| 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/text')
| -rw-r--r-- | examples/quick/text/main.cpp | 2 | ||||
| -rw-r--r-- | examples/quick/text/text.pro | 8 | ||||
| -rw-r--r-- | examples/quick/text/text.qml | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/examples/quick/text/main.cpp b/examples/quick/text/main.cpp index 0e84b8de2f..9b3c62657b 100644 --- a/examples/quick/text/main.cpp +++ b/examples/quick/text/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(text) diff --git a/examples/quick/text/text.pro b/examples/quick/text/text.pro index b3734e29f3..2f78548d05 100644 --- a/examples/quick/text/text.pro +++ b/examples/quick/text/text.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/text +target.path = $$[QT_INSTALL_EXAMPLES]/quick/text qml.files = fonts imgtag styledtext-layout.qml text.qml textselection -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/text -sources.files = $$SOURCES text.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/text +INSTALLS += target qml diff --git a/examples/quick/text/text.qml b/examples/quick/text/text.qml index 383e65e51c..b506fe53f8 100644 --- a/examples/quick/text/text.qml +++ b/examples/quick/text/text.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" +import "../shared" Item { height: 480 |