diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 13:55:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:02 +0200 |
| commit | 314fdbce8ce473eb3610be3658c61fab2fac0efb (patch) | |
| tree | 98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /examples/painting/painting.pro | |
| parent | 8d7647e286e07690de15a6ff9189307ee1a3517c (diff) | |
| parent | 83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
config.tests/unix/opengldesktop/opengldesktop.cpp
examples/itemviews/interview/interview.pro
examples/mainwindows/mainwindow/mainwindow.pro
examples/openvg/README
examples/richtext/textedit/textedit.pro
examples/tools/undo/undo.pro
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreapplication.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qmetatype.h
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/text/qfontdatabase.cpp
src/opengl/qgl.h
src/openvg/qpaintengine_vg.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
tests/auto/qmainwindow/qmainwindow.pro
Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
Diffstat (limited to 'examples/painting/painting.pro')
| -rw-r--r-- | examples/painting/painting.pro | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/examples/painting/painting.pro b/examples/painting/painting.pro index 68d4d73b62..263cc7326b 100644 --- a/examples/painting/painting.pro +++ b/examples/painting/painting.pro @@ -1,6 +1,12 @@ TEMPLATE = subdirs SUBDIRS = basicdrawing \ concentriccircles \ + examples_affine \ + examples_composition \ + examples_deform \ + examples_gradients \ + examples_pathstroke \ + painting_shared \ imagecomposition \ painterpaths \ transformations \ @@ -15,3 +21,18 @@ INSTALLS += target sources symbian: CONFIG += qt_example QT += widgets maemo5: CONFIG += qt_example + +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 +} |