diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-21 14:04:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-21 16:36:50 +0100 |
| commit | 626283740f9e670a9756e792d36b7cfe6a02cf45 (patch) | |
| tree | 1abb9662ce38bf42b6adb2a5903bdca50c0d0362 /examples/widgets/desktop | |
| parent | 23e44afe7a27a385f430fbae9ce4948a44b93bce (diff) | |
Fix building of examples.
- Correct install path of widget examples to contain widgets
directory in target tree.
- Add missing resources.
Task-number: QTBUG-27977
Change-Id: If4cb117998892b0b165d7678367553d3a7553b91
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'examples/widgets/desktop')
| -rw-r--r-- | examples/widgets/desktop/desktop.pro | 4 | ||||
| -rw-r--r-- | examples/widgets/desktop/screenshot/screenshot.pro | 4 | ||||
| -rw-r--r-- | examples/widgets/desktop/systray/systray.pro | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/examples/widgets/desktop/desktop.pro b/examples/widgets/desktop/desktop.pro index adfa51f130..d190a3bc2f 100644 --- a/examples/widgets/desktop/desktop.pro +++ b/examples/widgets/desktop/desktop.pro @@ -3,9 +3,9 @@ CONFIG += ordered SUBDIRS = screenshot systray # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop INSTALLS += target sources QT += widgets diff --git a/examples/widgets/desktop/screenshot/screenshot.pro b/examples/widgets/desktop/screenshot/screenshot.pro index e9f53f7450..db1a16a2e1 100644 --- a/examples/widgets/desktop/screenshot/screenshot.pro +++ b/examples/widgets/desktop/screenshot/screenshot.pro @@ -3,9 +3,9 @@ SOURCES = main.cpp \ screenshot.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/screenshot +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop/screenshot sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS screenshot.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/screenshot +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop/screenshot INSTALLS += target sources QT += widgets diff --git a/examples/widgets/desktop/systray/systray.pro b/examples/widgets/desktop/systray/systray.pro index 5fdcf1f9c8..57a4f5b681 100644 --- a/examples/widgets/desktop/systray/systray.pro +++ b/examples/widgets/desktop/systray/systray.pro @@ -6,9 +6,9 @@ RESOURCES = systray.qrc QT += widgets # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/systray -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS systray.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/systray +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop/systray +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS systray.pro images +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop/systray INSTALLS += target sources simulator: warning(This example might not fully work on Simulator platform) |