diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 18:55:53 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 18:55:53 +0100 |
commit | 6239af6f0f15871e02a516c97c5f1775743d352b (patch) | |
tree | 904e3e5df8c6f3e4aa820db4f2d9e73e3026dfd4 /examples/widgets/tools/echoplugin | |
parent | 3dc47622a469ded1c99397fdedc2053b73d57189 (diff) | |
parent | 6654a05fcad565a302e205e7f7deaa0b2757082d (diff) |
Merge branch 'release' into stable
Change-Id: If3aa1b7ed75082eff6e9761ad82c83691135ed60
Diffstat (limited to 'examples/widgets/tools/echoplugin')
-rw-r--r-- | examples/widgets/tools/echoplugin/echoplugin.pro | 2 | ||||
-rw-r--r-- | examples/widgets/tools/echoplugin/echowindow/echowindow.pro | 2 | ||||
-rw-r--r-- | examples/widgets/tools/echoplugin/plugin/plugin.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/widgets/tools/echoplugin/echoplugin.pro b/examples/widgets/tools/echoplugin/echoplugin.pro index 986ba9c9c3..d95eb6b64a 100644 --- a/examples/widgets/tools/echoplugin/echoplugin.pro +++ b/examples/widgets/tools/echoplugin/echoplugin.pro @@ -5,5 +5,5 @@ SUBDIRS = echowindow \ #! [0] # install -target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin +target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/echoplugin INSTALLS += target diff --git a/examples/widgets/tools/echoplugin/echowindow/echowindow.pro b/examples/widgets/tools/echoplugin/echowindow/echowindow.pro index c8dc000678..2d14e5ba03 100644 --- a/examples/widgets/tools/echoplugin/echowindow/echowindow.pro +++ b/examples/widgets/tools/echoplugin/echowindow/echowindow.pro @@ -15,7 +15,7 @@ win32 { } # install -target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin +target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/echoplugin INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/tools/echoplugin/plugin/plugin.pro b/examples/widgets/tools/echoplugin/plugin/plugin.pro index 235358d52c..4afe56c024 100644 --- a/examples/widgets/tools/echoplugin/plugin/plugin.pro +++ b/examples/widgets/tools/echoplugin/plugin/plugin.pro @@ -12,5 +12,5 @@ DESTDIR = ../plugins EXAMPLE_FILES = echoplugin.json # install -target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/plugin +target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/echoplugin/plugin INSTALLS += target |