From b1909fe1184860902fe279bb1184d3d9fa3c4c57 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 10 Jul 2012 16:13:06 +0200 Subject: [PATCH] qtbase: Add missing example installs and files. Change-Id: I071fd862e001b766c9fb13106242edf23a608663 Reviewed-by: Oswald Buddenhagen --- examples/effects/fademessage/fademessage.pro | 3 ++- examples/graphicsview/flowlayout/flowlayout.pro | 6 ++++++ examples/network/bearermonitor/bearermonitor.pro | 5 +++++ examples/opengl/cube/cube.pro | 5 +++++ examples/widgets/applicationicon/applicationicon.pro | 6 ++++++ examples/widgets/elidedlabel/elidedlabel.pro | 7 +++++-- examples/widgets/orientation/orientation.pro | 5 +++++ 7 files changed, 34 insertions(+), 3 deletions(-) diff --git a/examples/effects/fademessage/fademessage.pro b/examples/effects/fademessage/fademessage.pro index c40ee76..98161e0 100644 --- a/examples/effects/fademessage/fademessage.pro +++ b/examples/effects/fademessage/fademessage.pro @@ -9,7 +9,8 @@ sources.files = $$SOURCES \ $$HEADERS \ $$RESOURCES \ $$FORMS \ - fademessage.pro + fademessage.pro \ + background.jpg sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/fademessage diff --git a/examples/graphicsview/flowlayout/flowlayout.pro b/examples/graphicsview/flowlayout/flowlayout.pro index 4a4b22b..5f69a74 100644 --- a/examples/graphicsview/flowlayout/flowlayout.pro +++ b/examples/graphicsview/flowlayout/flowlayout.pro @@ -5,4 +5,10 @@ QMAKE_PROJECT_NAME = flowlayout_graphicsview HEADERS += flowlayout.h window.h SOURCES += flowlayout.cpp main.cpp window.cpp +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/flowlayout +sources.files = $$SOURCES $$HEADERS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/flowlayout +INSTALLS += target sources + simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro index c8ae6d6..e45cb63 100644 --- a/examples/network/bearermonitor/bearermonitor.pro +++ b/examples/network/bearermonitor/bearermonitor.pro @@ -17,3 +17,8 @@ wince*:LIBS += -lws2 CONFIG += console +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/bearermonitor +sources.files = $$SOURCES $$HEADERS *.ui *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/bearermonitor +INSTALLS += target sources diff --git a/examples/opengl/cube/cube.pro b/examples/opengl/cube/cube.pro index 98a3082..ad84450 100644 --- a/examples/opengl/cube/cube.pro +++ b/examples/opengl/cube/cube.pro @@ -24,5 +24,10 @@ contains(QT_CONFIG, opengl) { fshader.glsl } +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/cube +sources.files = $$SOURCES $$HEADERS $$RESOURCES cube.png *.glsl *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/cube +INSTALLS += target sources simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/applicationicon/applicationicon.pro b/examples/widgets/applicationicon/applicationicon.pro index 6b14644..0a3ba8b 100644 --- a/examples/widgets/applicationicon/applicationicon.pro +++ b/examples/widgets/applicationicon/applicationicon.pro @@ -9,3 +9,9 @@ SOURCES += main.cpp OTHER_FILES += applicationicon.svg \ applicationicon.png \ applicationicon.desktop + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/applicationicon +sources.files = $$SOURCES $$HEADERS applicationicon.svg applicationicon.png *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/applicationicon +INSTALLS += target sources diff --git a/examples/widgets/elidedlabel/elidedlabel.pro b/examples/widgets/elidedlabel/elidedlabel.pro index 1e391d9..f3fbc23 100644 --- a/examples/widgets/elidedlabel/elidedlabel.pro +++ b/examples/widgets/elidedlabel/elidedlabel.pro @@ -14,5 +14,8 @@ HEADERS += \ testwidget.h \ elidedlabel.h -CONFIG += mobility -MOBILITY = +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/elidedlabel +sources.files = $$SOURCES $$HEADERS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/elidedlabel +INSTALLS += target sources diff --git a/examples/widgets/orientation/orientation.pro b/examples/widgets/orientation/orientation.pro index 2334cb0..36a3e91 100644 --- a/examples/widgets/orientation/orientation.pro +++ b/examples/widgets/orientation/orientation.pro @@ -22,5 +22,10 @@ FORMS += \ RESOURCES += \ images.qrc +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/orientation +sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/orientation +INSTALLS += target sources simulator: warning(This example might not fully work on Simulator platform) -- 2.7.4