diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 18:55:53 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 18:55:53 +0100 |
commit | 6239af6f0f15871e02a516c97c5f1775743d352b (patch) | |
tree | 904e3e5df8c6f3e4aa820db4f2d9e73e3026dfd4 /examples/widgets/painting | |
parent | 3dc47622a469ded1c99397fdedc2053b73d57189 (diff) | |
parent | 6654a05fcad565a302e205e7f7deaa0b2757082d (diff) |
Merge branch 'release' into stable
Change-Id: If3aa1b7ed75082eff6e9761ad82c83691135ed60
Diffstat (limited to 'examples/widgets/painting')
-rw-r--r-- | examples/widgets/painting/painting.pro | 27 | ||||
-rw-r--r-- | examples/widgets/painting/shared/shared.pro | 26 |
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 |