From 626283740f9e670a9756e792d36b7cfe6a02cf45 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 21 Nov 2012 14:04:34 +0100
Subject: 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>
---
 examples/widgets/draganddrop/draganddrop.pro                   | 2 +-
 examples/widgets/draganddrop/draggableicons/draggableicons.pro | 4 ++--
 examples/widgets/draganddrop/draggabletext/draggabletext.pro   | 4 ++--
 examples/widgets/draganddrop/dropsite/dropsite.pro             | 4 ++--
 examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro   | 4 ++--
 examples/widgets/draganddrop/puzzle/puzzle.pro                 | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'examples/widgets/draganddrop')

diff --git a/examples/widgets/draganddrop/draganddrop.pro b/examples/widgets/draganddrop/draganddrop.pro
index a209ae31e4..59134fb978 100644
--- a/examples/widgets/draganddrop/draganddrop.pro
+++ b/examples/widgets/draganddrop/draganddrop.pro
@@ -8,6 +8,6 @@ SUBDIRS     = draggableicons \
 wince*: SUBDIRS -= dropsite
 # install
 sources.files = README *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop
 INSTALLS += sources
 QT += widgets
diff --git a/examples/widgets/draganddrop/draggableicons/draggableicons.pro b/examples/widgets/draganddrop/draggableicons/draggableicons.pro
index 9f4156135f..41e832fcc6 100644
--- a/examples/widgets/draganddrop/draggableicons/draggableicons.pro
+++ b/examples/widgets/draganddrop/draggableicons/draggableicons.pro
@@ -4,9 +4,9 @@ SOURCES     = dragwidget.cpp \
               main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/draggableicons
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/draggableicons
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/draggableicons
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/draggableicons
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/draganddrop/draggabletext/draggabletext.pro b/examples/widgets/draganddrop/draggabletext/draggabletext.pro
index 1fd8e5ce6e..669c3a32cc 100644
--- a/examples/widgets/draganddrop/draggabletext/draggabletext.pro
+++ b/examples/widgets/draganddrop/draggabletext/draggabletext.pro
@@ -6,9 +6,9 @@ SOURCES     = draglabel.cpp \
               main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/draggabletext
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/draggabletext
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.txt *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/draggabletext
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/draggabletext
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/draganddrop/dropsite/dropsite.pro b/examples/widgets/draganddrop/dropsite/dropsite.pro
index 8198b19e79..abb171ad3c 100644
--- a/examples/widgets/draganddrop/dropsite/dropsite.pro
+++ b/examples/widgets/draganddrop/dropsite/dropsite.pro
@@ -5,9 +5,9 @@ SOURCES = droparea.cpp \
           main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/dropsite
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/dropsite
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/dropsite
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/dropsite
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro b/examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro
index 2bbfdf0b3a..95159ccdf5 100644
--- a/examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro
+++ b/examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro
@@ -6,9 +6,9 @@ SOURCES     = draglabel.cpp \
               main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/fridgemagnets
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/fridgemagnets
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/fridgemagnets
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/fridgemagnets
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/draganddrop/puzzle/puzzle.pro b/examples/widgets/draganddrop/puzzle/puzzle.pro
index 7c69a41a39..3407a5e094 100644
--- a/examples/widgets/draganddrop/puzzle/puzzle.pro
+++ b/examples/widgets/draganddrop/puzzle/puzzle.pro
@@ -10,9 +10,9 @@ SOURCES     = main.cpp \
 QMAKE_PROJECT_NAME = dndpuzzle
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/puzzle
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/puzzle
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/puzzle
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/puzzle
 INSTALLS += target sources
 
 wince*: {
-- 
cgit v1.2.3