diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:29:32 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:37:03 +0100 |
| commit | 4821058f10118be55a541ad39e25ec9165cca3b3 (patch) | |
| tree | 167973e3c68fc442b0e37d6f628f3fdbe759f15a /examples/localstorage/localstorage.pro | |
| parent | 83f11e33745180e9370d484cbcedd0bac020c9dd (diff) | |
| parent | 26d5f2e833f0e3686aaa27e695bbfab5fbd808ad (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
Diffstat (limited to 'examples/localstorage/localstorage.pro')
| -rw-r--r-- | examples/localstorage/localstorage.pro | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/examples/localstorage/localstorage.pro b/examples/localstorage/localstorage.pro index 967108504e..99f498d5df 100644 --- a/examples/localstorage/localstorage.pro +++ b/examples/localstorage/localstorage.pro @@ -1 +1,9 @@ -TEMPLATE = subdirs +TEMPLATE = app + +QT += quick qml +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/localstorage +qml.files = localstorage.qml hello.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/localstorage +INSTALLS += target qml
\ No newline at end of file |