From 626283740f9e670a9756e792d36b7cfe6a02cf45 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint 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 --- examples/widgets/mainwindows/application/application.pro | 4 ++-- examples/widgets/mainwindows/dockwidgets/dockwidgets.pro | 4 ++-- examples/widgets/mainwindows/mainwindow/mainwindow.pro | 4 ++-- examples/widgets/mainwindows/mainwindows.pro | 4 ++-- examples/widgets/mainwindows/mdi/mdi.pro | 4 ++-- examples/widgets/mainwindows/menus/menus.pro | 4 ++-- examples/widgets/mainwindows/recentfiles/recentfiles.pro | 4 ++-- examples/widgets/mainwindows/sdi/sdi.pro | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'examples/widgets/mainwindows') diff --git a/examples/widgets/mainwindows/application/application.pro b/examples/widgets/mainwindows/application/application.pro index ef866a6d5f..cbf8b60760 100644 --- a/examples/widgets/mainwindows/application/application.pro +++ b/examples/widgets/mainwindows/application/application.pro @@ -6,9 +6,9 @@ RESOURCES = application.qrc #! [0] # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/application +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/application sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS application.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/application +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/application INSTALLS += target sources QT += widgets diff --git a/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro b/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro index 7e0da2496e..c52c883d2e 100644 --- a/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro +++ b/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro @@ -4,9 +4,9 @@ SOURCES = main.cpp \ RESOURCES = dockwidgets.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/dockwidgets +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/dockwidgets sources.files = $$SOURCES $$HEADERS $$RESOURCES dockwidgets.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/dockwidgets +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/dockwidgets INSTALLS += target sources QT += widgets diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.pro b/examples/widgets/mainwindows/mainwindow/mainwindow.pro index 1381c460c2..2ff1dafcf8 100644 --- a/examples/widgets/mainwindows/mainwindow/mainwindow.pro +++ b/examples/widgets/mainwindows/mainwindow/mainwindow.pro @@ -9,9 +9,9 @@ build_all:!build_pass { RESOURCES += mainwindow.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mainwindow +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/mainwindow sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mainwindow +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/mainwindow INSTALLS += target sources QT += widgets diff --git a/examples/widgets/mainwindows/mainwindows.pro b/examples/widgets/mainwindows/mainwindows.pro index c30d29e95a..021e442acb 100644 --- a/examples/widgets/mainwindows/mainwindows.pro +++ b/examples/widgets/mainwindows/mainwindows.pro @@ -8,9 +8,9 @@ SUBDIRS = application \ sdi # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mainwindows.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows INSTALLS += target sources QT += widgets diff --git a/examples/widgets/mainwindows/mdi/mdi.pro b/examples/widgets/mainwindows/mdi/mdi.pro index a4387fecd6..82f08daf48 100644 --- a/examples/widgets/mainwindows/mdi/mdi.pro +++ b/examples/widgets/mainwindows/mdi/mdi.pro @@ -6,9 +6,9 @@ SOURCES = main.cpp \ RESOURCES = mdi.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mdi +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/mdi sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mdi.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mdi +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/mdi INSTALLS += target sources QT += widgets diff --git a/examples/widgets/mainwindows/menus/menus.pro b/examples/widgets/mainwindows/menus/menus.pro index 5ed1e0dae5..06de2ebf42 100644 --- a/examples/widgets/mainwindows/menus/menus.pro +++ b/examples/widgets/mainwindows/menus/menus.pro @@ -3,9 +3,9 @@ SOURCES = mainwindow.cpp \ main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/menus +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/menus sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS menus.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/menus +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/menus INSTALLS += target sources QT += widgets diff --git a/examples/widgets/mainwindows/recentfiles/recentfiles.pro b/examples/widgets/mainwindows/recentfiles/recentfiles.pro index 5425efc68f..162532a239 100644 --- a/examples/widgets/mainwindows/recentfiles/recentfiles.pro +++ b/examples/widgets/mainwindows/recentfiles/recentfiles.pro @@ -3,9 +3,9 @@ SOURCES = main.cpp \ mainwindow.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/recentfiles +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/recentfiles sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS recentfiles.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/recentfiles +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/recentfiles INSTALLS += target sources QT += widgets diff --git a/examples/widgets/mainwindows/sdi/sdi.pro b/examples/widgets/mainwindows/sdi/sdi.pro index cd5e0f1616..21515d8930 100644 --- a/examples/widgets/mainwindows/sdi/sdi.pro +++ b/examples/widgets/mainwindows/sdi/sdi.pro @@ -4,9 +4,9 @@ SOURCES = main.cpp \ RESOURCES = sdi.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/sdi +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/sdi sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sdi.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/sdi +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/sdi INSTALLS += target sources QT += widgets -- cgit v1.2.3