summaryrefslogtreecommitdiffstats
path: root/examples/widgets
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-01-24 22:12:17 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-31 15:51:09 +0100
commitb644ed510af512c5688f139317249eea869e2853 (patch)
treef20e132d5a7f6dd08708d63b5655fd5cf1d20479 /examples/widgets
parent839009c74f88e397f5bc6fad4dc5ce497072ef4b (diff)
don't build shared demo library which is not used anyway
this amends 5a2fc03ef4 Change-Id: I42b2141ad33b75041ee2bb58af642fc3d07f290e Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'examples/widgets')
-rw-r--r--examples/widgets/painting/painting.pro27
-rw-r--r--examples/widgets/painting/shared/shared.pro26
2 files changed, 7 insertions, 46 deletions
diff --git a/examples/widgets/painting/painting.pro b/examples/widgets/painting/painting.pro
index 7459dd3e94..a9749a560d 100644
--- a/examples/widgets/painting/painting.pro
+++ b/examples/widgets/painting/painting.pro
@@ -1,28 +1,15 @@
TEMPLATE = subdirs
SUBDIRS = basicdrawing \
concentriccircles \
- examples_affine \
- examples_composition \
- examples_deform \
- examples_gradients \
- examples_pathstroke \
- painting_shared \
+ affine \
+ composition \
+ deform \
+ gradients \
+ pathstroke \
imagecomposition \
painterpaths \
transformations \
fontsampler
-examples_affine.subdir = affine
-examples_composition.subdir = composition
-examples_deform.subdir = deform
-examples_gradients.subdir = gradients
-examples_pathstroke.subdir = pathstroke
-painting_shared.subdir = shared
-
-!ordered {
- examples_affine.depends = painting_shared
- examples_deform.depends = painting_shared
- examples_gradients.depends = painting_shared
- examples_composition.depends = painting_shared
- examples_pathstroke.depends = painting_shared
-}
+EXAMPLE_FILES = \
+ shared
diff --git a/examples/widgets/painting/shared/shared.pro b/examples/widgets/painting/shared/shared.pro
deleted file mode 100644
index 2756bf75ca..0000000000
--- a/examples/widgets/painting/shared/shared.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-TEMPLATE = lib
-CONFIG += static
-
-qtHaveModule(opengl) {
- DEFINES += QT_OPENGL_SUPPORT
- QT += opengl
-}
-QT += widgets
-
-build_all:!build_pass {
- CONFIG -= build_all
- CONFIG += release
-}
-TARGET = demo_shared
-
-SOURCES += \
- arthurstyle.cpp\
- arthurwidgets.cpp \
- hoverpoints.cpp
-
-HEADERS += \
- arthurstyle.h \
- arthurwidgets.h \
- hoverpoints.h
-
-RESOURCES += shared.qrc