diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-04 14:08:45 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-04 14:10:23 +0200 |
| commit | d936b9d37fb4545308d3cf3c3d928af12f942255 (patch) | |
| tree | 08cea05a1c45b8b42c564f74301adce3b410f079 /examples/designer | |
| parent | 5c4b4b87ff55facb0672db6876ade6640e359b4c (diff) | |
Fix building of the Arthur plugin.
Do not build by default as it requires a library located in the
qtbase painting examples.
Change-Id: I19ac8ad31f9b2e194f88c5c3b168a2352dd72f1e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'examples/designer')
| -rw-r--r-- | examples/designer/arthurplugin/arthurplugin.pro | 18 | ||||
| -rw-r--r-- | examples/designer/arthurplugin/plugin.cpp | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/examples/designer/arthurplugin/arthurplugin.pro b/examples/designer/arthurplugin/arthurplugin.pro index 34928ef38..2e9fd5432 100644 --- a/examples/designer/arthurplugin/arthurplugin.pro +++ b/examples/designer/arthurplugin/arthurplugin.pro @@ -9,19 +9,21 @@ contains(QT_CONFIG, opengl) { QT += opengl } -SHARED_FOLDER = QT_CORE_SOURCES/examples/painting/shared -include(QT_CORE_SOURCES/examples/painting/shared/shared.pri) +QT_BASE_EXAMPLES = $$QT.core.sources/../../examples -EXAMPLE_AFFINE_DIR = QT_CORE_SOURCES/examples/painting/affine -EXAMPLE_COMPOSITION_DIR = QT_CORE_SOURCES/examples/painting/composition -EXAMPLE_DEFORM_DIR = QT_CORE_SOURCES/examples/painting/deform -EXAMPLE_GRADIENT_DIR = QT_CORE_SOURCES/examples/painting/gradients -EXAMPLE_STROKE_DIR = QT_CORE_SOURCES/examples/painting/pathstroke +SHARED_FOLDER = $$QT_BASE_EXAMPLES/painting/shared +include($$QT_BASE_EXAMPLES/painting/shared/shared.pri) + +EXAMPLE_AFFINE_DIR = $$QT_BASE_EXAMPLES/painting/affine +EXAMPLE_COMPOSITION_DIR = $$QT_BASE_EXAMPLES/painting/composition +EXAMPLE_DEFORM_DIR = $$QT_BASE_EXAMPLES/painting/deform +EXAMPLE_GRADIENT_DIR = $$QT_BASE_EXAMPLES/painting/gradients +EXAMPLE_STROKE_DIR = $$QT_BASE_EXAMPLES/painting/pathstroke INCLUDEPATH += $$EXAMPLE_AFFINE_DIR $$EXAMPLE_COMPOSITION_DIR $$EXAMPLE_DEFORM_DIR $$EXAMPLE_GRADIENT_DIR $$EXAMPLE_STROKE_DIR SOURCES = plugin.cpp \ - $EXAMPLE_AFFINE_DIR/xform.cpp \ + $$EXAMPLE_AFFINE_DIR/xform.cpp \ $$EXAMPLE_COMPOSITION_DIR/composition.cpp \ $$EXAMPLE_DEFORM_DIR/pathdeform.cpp \ $$EXAMPLE_GRADIENT_DIR/gradients.cpp \ diff --git a/examples/designer/arthurplugin/plugin.cpp b/examples/designer/arthurplugin/plugin.cpp index c278985ed..6dfa41fb9 100644 --- a/examples/designer/arthurplugin/plugin.cpp +++ b/examples/designer/arthurplugin/plugin.cpp @@ -44,7 +44,7 @@ #include <QtCore/qplugin.h> #include <QtWidgets/QIcon> -#include <QtWidgets/QPixmap> +#include <QtGui/QPixmap> #include "xform.h" #include "pathdeform.h" |