summaryrefslogtreecommitdiffstats
path: root/examples/qml/xmlhttprequest
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-11-29 16:02:34 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-10 18:16:48 +0100
commita6065d60f158ffad7a94877883af69731da94295 (patch)
tree5657fd490fd8a3f9794a8c9bcc9f85cf24a095c1 /examples/qml/xmlhttprequest
parentc18e04b2e61f174a4883f6884cf9a0712c5725e3 (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/qml/xmlhttprequest')
-rw-r--r--examples/qml/xmlhttprequest/main.cpp4
-rw-r--r--examples/qml/xmlhttprequest/xmlhttprequest.pro7
-rw-r--r--examples/qml/xmlhttprequest/xmlhttprequest.qml2
3 files changed, 8 insertions, 5 deletions
diff --git a/examples/qml/xmlhttprequest/main.cpp b/examples/qml/xmlhttprequest/main.cpp
index 976a462464..25f3759de5 100644
--- a/examples/qml/xmlhttprequest/main.cpp
+++ b/examples/qml/xmlhttprequest/main.cpp
@@ -37,5 +37,5 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(xmlhttprequest) \ No newline at end of file
+#include "../../quick/shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(xmlhttprequest)
diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.pro b/examples/qml/xmlhttprequest/xmlhttprequest.pro
index bb7fae66bf..5af32eeab6 100644
--- a/examples/qml/xmlhttprequest/xmlhttprequest.pro
+++ b/examples/qml/xmlhttprequest/xmlhttprequest.pro
@@ -3,7 +3,10 @@ TEMPLATE = app
QT += quick qml
SOURCES += main.cpp
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/xmlhttprequest
+EXAMPLE_FILES = \
+ data.xml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/xmlhttprequest
qml.files = xmlhttprequest.qml get.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/xmlhttprequest
+qml.path = $$[QT_INSTALL_EXAMPLES]/qml/xmlhttprequest
INSTALLS += target qml
diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.qml b/examples/qml/xmlhttprequest/xmlhttprequest.qml
index b9bf4548cb..b483ac1aa0 100644
--- a/examples/qml/xmlhttprequest/xmlhttprequest.qml
+++ b/examples/qml/xmlhttprequest/xmlhttprequest.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import "../../shared" as Examples
+import "../../quick/shared" as Examples
Item {
height: 480