From 3edf2e19dc1d2f41f941291ae78bddc2b5e32e03 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 28 Nov 2012 16:09:12 +0100 Subject: centralize and fixup example sources install targets follow respective change in qtbase Change-Id: I6bbcefcad264191dac51d52cd335de776ae3bfe5 Reviewed-by: Jerome Pasion --- examples/activeqt/activeqt.pro | 6 ------ examples/activeqt/comapp/comapp.pro | 4 +--- examples/activeqt/hierarchy/hierarchy.pro | 4 +--- examples/activeqt/menus/menus.pro | 4 +--- examples/activeqt/multiple/multiple.pro | 4 +--- examples/activeqt/opengl/opengl.pro | 4 +--- examples/activeqt/qutlook/qutlook.pro | 4 +--- examples/activeqt/simple/simple.pro | 4 +--- examples/activeqt/webbrowser/webbrowser.pro | 4 +--- examples/activeqt/wrapper/wrapper.pro | 4 +--- 10 files changed, 9 insertions(+), 33 deletions(-) (limited to 'examples') diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro index 5d47940..09b58e6 100644 --- a/examples/activeqt/activeqt.pro +++ b/examples/activeqt/activeqt.pro @@ -12,9 +12,3 @@ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):SUBDIRS += opengl # For now only the contain examples with mingw, for the others you need # an IDL compiler win32-g++*|wince*:SUBDIRS = webbrowser - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/activeqt -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS activeqt.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt -INSTALLS += target sources diff --git a/examples/activeqt/comapp/comapp.pro b/examples/activeqt/comapp/comapp.pro index f82dcf6..271241b 100644 --- a/examples/activeqt/comapp/comapp.pro +++ b/examples/activeqt/comapp/comapp.pro @@ -10,6 +10,4 @@ RC_FILE = comapp.rc # install target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/comapp -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE comapp.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/comapp -INSTALLS += target sources +INSTALLS += target diff --git a/examples/activeqt/hierarchy/hierarchy.pro b/examples/activeqt/hierarchy/hierarchy.pro index 4429ef6..8c87f4c 100644 --- a/examples/activeqt/hierarchy/hierarchy.pro +++ b/examples/activeqt/hierarchy/hierarchy.pro @@ -11,6 +11,4 @@ DEF_FILE = hierarchy.def # install target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/hierarchy -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE $$DEF_FILE hierarchy.ico hierarchy.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/hierarchy -INSTALLS += target sources +INSTALLS += target diff --git a/examples/activeqt/menus/menus.pro b/examples/activeqt/menus/menus.pro index de41ac1..3dac743 100644 --- a/examples/activeqt/menus/menus.pro +++ b/examples/activeqt/menus/menus.pro @@ -10,6 +10,4 @@ RC_FILE = menus.rc # install target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/menus -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE menus.ico menus.pro *.xpm -sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/menus -INSTALLS += target sources +INSTALLS += target diff --git a/examples/activeqt/multiple/multiple.pro b/examples/activeqt/multiple/multiple.pro index 3dbf77e..c274777 100644 --- a/examples/activeqt/multiple/multiple.pro +++ b/examples/activeqt/multiple/multiple.pro @@ -11,6 +11,4 @@ DEF_FILE = multipleax.def # install target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/multiple -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE $$DEF_FILE multipleax.ico multiple.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/multiple -INSTALLS += target sources +INSTALLS += target diff --git a/examples/activeqt/opengl/opengl.pro b/examples/activeqt/opengl/opengl.pro index 283a6e1..83772d6 100644 --- a/examples/activeqt/opengl/opengl.pro +++ b/examples/activeqt/opengl/opengl.pro @@ -14,6 +14,4 @@ RC_FILE = opengl.rc # install target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/opengl -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE opengl.ico opengl.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/opengl -INSTALLS += target sources +INSTALLS += target diff --git a/examples/activeqt/qutlook/qutlook.pro b/examples/activeqt/qutlook/qutlook.pro index 484107d..30d5bc5 100644 --- a/examples/activeqt/qutlook/qutlook.pro +++ b/examples/activeqt/qutlook/qutlook.pro @@ -18,6 +18,4 @@ isEmpty(TYPELIBS) { # install target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/qutlook -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qutlook.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/qutlook -INSTALLS += target sources +INSTALLS += target diff --git a/examples/activeqt/simple/simple.pro b/examples/activeqt/simple/simple.pro index 31231d6..80b1757 100644 --- a/examples/activeqt/simple/simple.pro +++ b/examples/activeqt/simple/simple.pro @@ -9,6 +9,4 @@ RC_FILE = simple.rc # install target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/simple -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE simple.ico simple.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/simple -INSTALLS += target sources +INSTALLS += target diff --git a/examples/activeqt/webbrowser/webbrowser.pro b/examples/activeqt/webbrowser/webbrowser.pro index 8b29560..995906f 100644 --- a/examples/activeqt/webbrowser/webbrowser.pro +++ b/examples/activeqt/webbrowser/webbrowser.pro @@ -10,6 +10,4 @@ wincewm*: FORMS = mainwindow_windowsmobile.ui # install target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/webbrowser -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS webbrowser.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/webbrowser -INSTALLS += target sources +INSTALLS += target diff --git a/examples/activeqt/wrapper/wrapper.pro b/examples/activeqt/wrapper/wrapper.pro index b07e8f3..6cebace 100644 --- a/examples/activeqt/wrapper/wrapper.pro +++ b/examples/activeqt/wrapper/wrapper.pro @@ -10,6 +10,4 @@ DEF_FILE = wrapperax.def # install target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/wrapper -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE $$DEF_FILE wrapperax.ico wrapper.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/wrapper -INSTALLS += target sources +INSTALLS += target -- cgit v1.2.1