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/dialogs/classwizard/classwizard.pro | 4 ++-- examples/widgets/dialogs/configdialog/configdialog.pro | 4 ++-- examples/widgets/dialogs/dialogs.pro | 2 +- examples/widgets/dialogs/extension/extension.pro | 4 ++-- examples/widgets/dialogs/findfiles/findfiles.pro | 4 ++-- examples/widgets/dialogs/licensewizard/licensewizard.pro | 4 ++-- examples/widgets/dialogs/sipdialog/sipdialog.pro | 4 ++-- examples/widgets/dialogs/standarddialogs/standarddialogs.pro | 4 ++-- examples/widgets/dialogs/tabdialog/tabdialog.pro | 4 ++-- examples/widgets/dialogs/trivialwizard/trivialwizard.pro | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) (limited to 'examples/widgets/dialogs') diff --git a/examples/widgets/dialogs/classwizard/classwizard.pro b/examples/widgets/dialogs/classwizard/classwizard.pro index d50ba675af..d02b703846 100644 --- a/examples/widgets/dialogs/classwizard/classwizard.pro +++ b/examples/widgets/dialogs/classwizard/classwizard.pro @@ -4,9 +4,9 @@ SOURCES = classwizard.cpp \ RESOURCES = classwizard.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/classwizard +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/classwizard sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/classwizard +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/classwizard INSTALLS += target sources QT += widgets diff --git a/examples/widgets/dialogs/configdialog/configdialog.pro b/examples/widgets/dialogs/configdialog/configdialog.pro index 643c2a238f..6c52d6639f 100644 --- a/examples/widgets/dialogs/configdialog/configdialog.pro +++ b/examples/widgets/dialogs/configdialog/configdialog.pro @@ -6,9 +6,9 @@ SOURCES = configdialog.cpp \ RESOURCES += configdialog.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/configdialog +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/configdialog sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/configdialog +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/configdialog INSTALLS += target sources wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/widgets/dialogs/dialogs.pro b/examples/widgets/dialogs/dialogs.pro index a59e480efa..8662fc5be2 100644 --- a/examples/widgets/dialogs/dialogs.pro +++ b/examples/widgets/dialogs/dialogs.pro @@ -13,7 +13,7 @@ wince*: SUBDIRS += sipdialog # install sources.files = README *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs INSTALLS += sources QT += widgets diff --git a/examples/widgets/dialogs/extension/extension.pro b/examples/widgets/dialogs/extension/extension.pro index 7e11dda4ab..4b538e15a5 100644 --- a/examples/widgets/dialogs/extension/extension.pro +++ b/examples/widgets/dialogs/extension/extension.pro @@ -3,9 +3,9 @@ SOURCES = finddialog.cpp \ main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/extension +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/extension sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/extension +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/extension INSTALLS += target sources QT += widgets diff --git a/examples/widgets/dialogs/findfiles/findfiles.pro b/examples/widgets/dialogs/findfiles/findfiles.pro index 51d1c0eed1..a2f33ea29e 100644 --- a/examples/widgets/dialogs/findfiles/findfiles.pro +++ b/examples/widgets/dialogs/findfiles/findfiles.pro @@ -3,9 +3,9 @@ SOURCES = main.cpp \ window.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/findfiles +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/findfiles sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/findfiles +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/findfiles INSTALLS += target sources QT += widgets diff --git a/examples/widgets/dialogs/licensewizard/licensewizard.pro b/examples/widgets/dialogs/licensewizard/licensewizard.pro index c61325772e..fe395786dc 100644 --- a/examples/widgets/dialogs/licensewizard/licensewizard.pro +++ b/examples/widgets/dialogs/licensewizard/licensewizard.pro @@ -4,9 +4,9 @@ SOURCES = licensewizard.cpp \ RESOURCES = licensewizard.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/licensewizard +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/licensewizard sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/licensewizard +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/licensewizard INSTALLS += target sources QT += widgets printsupport diff --git a/examples/widgets/dialogs/sipdialog/sipdialog.pro b/examples/widgets/dialogs/sipdialog/sipdialog.pro index 72db93f646..ae395fdd2c 100644 --- a/examples/widgets/dialogs/sipdialog/sipdialog.pro +++ b/examples/widgets/dialogs/sipdialog/sipdialog.pro @@ -3,9 +3,9 @@ SOURCES = main.cpp \ dialog.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/sipdialog +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/sipdialog sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/sipdialog +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/sipdialog INSTALLS += target sources wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/widgets/dialogs/standarddialogs/standarddialogs.pro b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro index cbcb4d7302..f18034d7ae 100644 --- a/examples/widgets/dialogs/standarddialogs/standarddialogs.pro +++ b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro @@ -3,9 +3,9 @@ SOURCES = dialog.cpp \ main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/standarddialogs +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/standarddialogs sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/standarddialogs +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/standarddialogs INSTALLS += target sources wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/widgets/dialogs/tabdialog/tabdialog.pro b/examples/widgets/dialogs/tabdialog/tabdialog.pro index 66ac14daf2..fc3ad17dea 100644 --- a/examples/widgets/dialogs/tabdialog/tabdialog.pro +++ b/examples/widgets/dialogs/tabdialog/tabdialog.pro @@ -3,9 +3,9 @@ SOURCES = main.cpp \ tabdialog.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/tabdialog +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/tabdialog sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/tabdialog +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/tabdialog INSTALLS += target sources wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/widgets/dialogs/trivialwizard/trivialwizard.pro b/examples/widgets/dialogs/trivialwizard/trivialwizard.pro index 26d488d99d..c9859bc578 100644 --- a/examples/widgets/dialogs/trivialwizard/trivialwizard.pro +++ b/examples/widgets/dialogs/trivialwizard/trivialwizard.pro @@ -1,9 +1,9 @@ SOURCES = trivialwizard.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/trivialwizard +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/trivialwizard sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/trivialwizard +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/trivialwizard INSTALLS += target sources QT += widgets -- cgit v1.2.3