From 24f0b5ec05a8461a4aceee6d746954ef80449b99 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 22 Jun 2012 12:48:32 +1000 Subject: [PATCH] Install examples to example hierarchy Some examples were installing to an old path of qtdeclarative/qtquick Task-number QTBUG-26205 Change-Id: I6e1840b1f1a87e24c1728de1b7320d6738bd530e Reviewed-by: Martin Jones --- examples/localstorage/localstorage.pro | 6 +++--- examples/qml/xmlhttprequest/xmlhttprequest.pro | 6 +++--- examples/quick/accessibility/accessibility.pro | 4 ++-- examples/quick/animation/animation.pro | 4 ++-- examples/quick/draganddrop/draganddrop.pro | 4 ++-- examples/quick/imageelements/imageelements.pro | 4 ++-- examples/quick/maskedmousearea/maskedmousearea.pro | 4 ++-- examples/quick/modelviews/modelviews.pro | 4 ++-- examples/quick/righttoleft/righttoleft.pro | 4 ++-- examples/quick/text/text.pro | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/localstorage/localstorage.pro b/examples/localstorage/localstorage.pro index 99f498d..311dc4a 100644 --- a/examples/localstorage/localstorage.pro +++ b/examples/localstorage/localstorage.pro @@ -3,7 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/localstorage +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/localstorage qml.files = localstorage.qml hello.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/localstorage -INSTALLS += target qml \ No newline at end of file +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/localstorage +INSTALLS += target qml diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.pro b/examples/qml/xmlhttprequest/xmlhttprequest.pro index 468afdf..e58ada7 100644 --- a/examples/qml/xmlhttprequest/xmlhttprequest.pro +++ b/examples/qml/xmlhttprequest/xmlhttprequest.pro @@ -3,7 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/xmlhttprequest +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/xmlhttprequest qml.files = xmlhttprequest.qml get.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/xmlhttprequest -INSTALLS += target qml \ No newline at end of file +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/xmlhttprequest +INSTALLS += target qml diff --git a/examples/quick/accessibility/accessibility.pro b/examples/quick/accessibility/accessibility.pro index 2826161..51877b2 100644 --- a/examples/quick/accessibility/accessibility.pro +++ b/examples/quick/accessibility/accessibility.pro @@ -3,8 +3,8 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/accessibility +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/accessibility qml.files = accessibility.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/accessibility +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/accessibility INSTALLS += target qml diff --git a/examples/quick/animation/animation.pro b/examples/quick/animation/animation.pro index cdf83f8..26cefba 100644 --- a/examples/quick/animation/animation.pro +++ b/examples/quick/animation/animation.pro @@ -3,8 +3,8 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/animation +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/animation qml.files = animation.qml basics behaviors easing pathanimation pathinterpolator states -qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/animation +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/animation INSTALLS += target qml diff --git a/examples/quick/draganddrop/draganddrop.pro b/examples/quick/draganddrop/draganddrop.pro index 3f53531..e4556da 100644 --- a/examples/quick/draganddrop/draganddrop.pro +++ b/examples/quick/draganddrop/draganddrop.pro @@ -3,8 +3,8 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/draganddrop +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/draganddrop qml.files = draganddrop.qml tiles views -qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/draganddrop +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/draganddrop INSTALLS += target qml diff --git a/examples/quick/imageelements/imageelements.pro b/examples/quick/imageelements/imageelements.pro index 89abac6..f193382 100644 --- a/examples/quick/imageelements/imageelements.pro +++ b/examples/quick/imageelements/imageelements.pro @@ -3,8 +3,8 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/imageelements +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/imageelements qml.files = borderimage.qml content imageelements.qml image.qml shadows.qml simplesprite.qml spriteimage.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/imageelements +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/imageelements INSTALLS += target qml diff --git a/examples/quick/maskedmousearea/maskedmousearea.pro b/examples/quick/maskedmousearea/maskedmousearea.pro index 53e14aa..1623f79 100644 --- a/examples/quick/maskedmousearea/maskedmousearea.pro +++ b/examples/quick/maskedmousearea/maskedmousearea.pro @@ -7,8 +7,8 @@ HEADERS += maskedmousearea.h SOURCES += main.cpp \ maskedmousearea.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/maskedmousearea +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/maskedmousearea qml.files = maskedmousearea.qml images -qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/maskedmousearea +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/maskedmousearea INSTALLS += target qml diff --git a/examples/quick/modelviews/modelviews.pro b/examples/quick/modelviews/modelviews.pro index 59c5e23..7e62266 100644 --- a/examples/quick/modelviews/modelviews.pro +++ b/examples/quick/modelviews/modelviews.pro @@ -3,7 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/modelviews +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/modelviews qml.files = \ modelviews.qml \ gridview \ @@ -13,6 +13,6 @@ qml.files = \ pathview \ visualdatamodel \ visualitemmodel -qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/modelviews +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/modelviews INSTALLS += target qml diff --git a/examples/quick/righttoleft/righttoleft.pro b/examples/quick/righttoleft/righttoleft.pro index 2e30765..cd5a48d 100644 --- a/examples/quick/righttoleft/righttoleft.pro +++ b/examples/quick/righttoleft/righttoleft.pro @@ -3,8 +3,8 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/righttoleft +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/righttoleft qml.files = righttoleft.qml layoutdirection layoutmirroring textalignment -qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/righttoleft +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/righttoleft INSTALLS += target qml diff --git a/examples/quick/text/text.pro b/examples/quick/text/text.pro index ab5c167..a9256a6 100644 --- a/examples/quick/text/text.pro +++ b/examples/quick/text/text.pro @@ -3,8 +3,8 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/text +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/text qml.files = fonts imgtag styledtext-layout.qml text.qml textselection -qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/text +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/text INSTALLS += target qml -- 2.7.4