From a6065d60f158ffad7a94877883af69731da94295 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 29 Nov 2012 16:02:34 +0100 Subject: centralize and fixup example sources install targets follow respective change in qtbase Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0 Reviewed-by: Oswald Buddenhagen Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> --- examples/quick/touchinteraction/main.cpp | 2 +- examples/quick/touchinteraction/touchinteraction.pro | 8 +++----- examples/quick/touchinteraction/touchinteraction.qml | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'examples/quick/touchinteraction') diff --git a/examples/quick/touchinteraction/main.cpp b/examples/quick/touchinteraction/main.cpp index 68215b5d89..aac3175743 100644 --- a/examples/quick/touchinteraction/main.cpp +++ b/examples/quick/touchinteraction/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(touchinteraction) diff --git a/examples/quick/touchinteraction/touchinteraction.pro b/examples/quick/touchinteraction/touchinteraction.pro index 83919c4e8f..949651c9cf 100644 --- a/examples/quick/touchinteraction/touchinteraction.pro +++ b/examples/quick/touchinteraction/touchinteraction.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/touchinteraction +target.path = $$[QT_INSTALL_EXAMPLES]/quick/touchinteraction qml.files = flickable multipointtouch pincharea touchinteraction.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/touchinteraction -sources.files = $$SOURCES touchinteraction.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/touchinteraction +INSTALLS += target qml diff --git a/examples/quick/touchinteraction/touchinteraction.qml b/examples/quick/touchinteraction/touchinteraction.qml index ab932e895f..c561714d50 100644 --- a/examples/quick/touchinteraction/touchinteraction.qml +++ b/examples/quick/touchinteraction/touchinteraction.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" +import "../shared" Item { height: 480 -- cgit v1.2.3