diff options
Diffstat (limited to 'examples/widgets/tools')
-rw-r--r-- | examples/widgets/tools/echoplugin/echoplugin.pro | 4 | ||||
-rw-r--r-- | examples/widgets/tools/echoplugin/echowindow/echowindow.pro | 2 | ||||
-rw-r--r-- | examples/widgets/tools/echoplugin/plugin/plugin.pro | 4 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/app/app.pro | 28 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/app/interfaces.h (renamed from examples/widgets/tools/plugandpaint/interfaces.h) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/app/main.cpp (renamed from examples/widgets/tools/plugandpaint/main.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/app/mainwindow.cpp (renamed from examples/widgets/tools/plugandpaint/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/app/mainwindow.h (renamed from examples/widgets/tools/plugandpaint/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/app/paintarea.cpp (renamed from examples/widgets/tools/plugandpaint/paintarea.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/app/paintarea.h (renamed from examples/widgets/tools/plugandpaint/paintarea.h) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/app/plugindialog.cpp (renamed from examples/widgets/tools/plugandpaint/plugindialog.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/app/plugindialog.h (renamed from examples/widgets/tools/plugandpaint/plugindialog.h) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/plugandpaint.pro | 25 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/basictools/basictools.json (renamed from examples/widgets/tools/plugandpaintplugins/basictools/basictools.json) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/basictools/basictools.pro (renamed from examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro) | 6 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp (renamed from examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h (renamed from examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.h) | 6 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.json (renamed from examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.json) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.pro (renamed from examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro) | 6 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp (renamed from examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.h (renamed from examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h) | 4 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/plugins.pro (renamed from examples/widgets/tools/plugandpaintplugins/plugandpaintplugins.pro) | 0 | ||||
-rw-r--r-- | examples/widgets/tools/styleplugin/plugin/plugin.pro | 2 | ||||
-rw-r--r-- | examples/widgets/tools/styleplugin/styleplugin.pro | 4 | ||||
-rw-r--r-- | examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro | 2 | ||||
-rw-r--r-- | examples/widgets/tools/tools.pro | 4 |
26 files changed, 53 insertions, 44 deletions
diff --git a/examples/widgets/tools/echoplugin/echoplugin.pro b/examples/widgets/tools/echoplugin/echoplugin.pro index d95eb6b64a..1e3d625b2f 100644 --- a/examples/widgets/tools/echoplugin/echoplugin.pro +++ b/examples/widgets/tools/echoplugin/echoplugin.pro @@ -3,7 +3,3 @@ TEMPLATE = subdirs SUBDIRS = echowindow \ plugin #! [0] - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/echoplugin -INSTALLS += target diff --git a/examples/widgets/tools/echoplugin/echowindow/echowindow.pro b/examples/widgets/tools/echoplugin/echowindow/echowindow.pro index fca0252a82..092258dd30 100644 --- a/examples/widgets/tools/echoplugin/echowindow/echowindow.pro +++ b/examples/widgets/tools/echoplugin/echowindow/echowindow.pro @@ -17,3 +17,5 @@ win32 { # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/echoplugin INSTALLS += target + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/widgets/tools/echoplugin/plugin/plugin.pro b/examples/widgets/tools/echoplugin/plugin/plugin.pro index 4afe56c024..a4b54b18f6 100644 --- a/examples/widgets/tools/echoplugin/plugin/plugin.pro +++ b/examples/widgets/tools/echoplugin/plugin/plugin.pro @@ -12,5 +12,7 @@ DESTDIR = ../plugins EXAMPLE_FILES = echoplugin.json # install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/echoplugin/plugin +target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/echoplugin/plugins INSTALLS += target + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/widgets/tools/plugandpaint/app/app.pro b/examples/widgets/tools/plugandpaint/app/app.pro new file mode 100644 index 0000000000..8139cd53ad --- /dev/null +++ b/examples/widgets/tools/plugandpaint/app/app.pro @@ -0,0 +1,28 @@ +#! [0] +TARGET = plugandpaint +DESTDIR = .. + +QT += widgets + +HEADERS = interfaces.h \ + mainwindow.h \ + paintarea.h \ + plugindialog.h +SOURCES = main.cpp \ + mainwindow.cpp \ + paintarea.cpp \ + plugindialog.cpp + +LIBS = -L../plugins -lpnp_basictools + +if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { + mac:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)_debug + win32:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)d +} +#! [0] + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/plugandpaint +INSTALLS += target + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/widgets/tools/plugandpaint/interfaces.h b/examples/widgets/tools/plugandpaint/app/interfaces.h index 53f447ce87..53f447ce87 100644 --- a/examples/widgets/tools/plugandpaint/interfaces.h +++ b/examples/widgets/tools/plugandpaint/app/interfaces.h diff --git a/examples/widgets/tools/plugandpaint/main.cpp b/examples/widgets/tools/plugandpaint/app/main.cpp index f157957da5..f157957da5 100644 --- a/examples/widgets/tools/plugandpaint/main.cpp +++ b/examples/widgets/tools/plugandpaint/app/main.cpp diff --git a/examples/widgets/tools/plugandpaint/mainwindow.cpp b/examples/widgets/tools/plugandpaint/app/mainwindow.cpp index 12c65e9364..12c65e9364 100644 --- a/examples/widgets/tools/plugandpaint/mainwindow.cpp +++ b/examples/widgets/tools/plugandpaint/app/mainwindow.cpp diff --git a/examples/widgets/tools/plugandpaint/mainwindow.h b/examples/widgets/tools/plugandpaint/app/mainwindow.h index 398759fecf..398759fecf 100644 --- a/examples/widgets/tools/plugandpaint/mainwindow.h +++ b/examples/widgets/tools/plugandpaint/app/mainwindow.h diff --git a/examples/widgets/tools/plugandpaint/paintarea.cpp b/examples/widgets/tools/plugandpaint/app/paintarea.cpp index 5d2170bfd4..5d2170bfd4 100644 --- a/examples/widgets/tools/plugandpaint/paintarea.cpp +++ b/examples/widgets/tools/plugandpaint/app/paintarea.cpp diff --git a/examples/widgets/tools/plugandpaint/paintarea.h b/examples/widgets/tools/plugandpaint/app/paintarea.h index 415e4c0be4..415e4c0be4 100644 --- a/examples/widgets/tools/plugandpaint/paintarea.h +++ b/examples/widgets/tools/plugandpaint/app/paintarea.h diff --git a/examples/widgets/tools/plugandpaint/plugindialog.cpp b/examples/widgets/tools/plugandpaint/app/plugindialog.cpp index 00c2498bd5..00c2498bd5 100644 --- a/examples/widgets/tools/plugandpaint/plugindialog.cpp +++ b/examples/widgets/tools/plugandpaint/app/plugindialog.cpp diff --git a/examples/widgets/tools/plugandpaint/plugindialog.h b/examples/widgets/tools/plugandpaint/app/plugindialog.h index f8e5bcda24..f8e5bcda24 100644 --- a/examples/widgets/tools/plugandpaint/plugindialog.h +++ b/examples/widgets/tools/plugandpaint/app/plugindialog.h diff --git a/examples/widgets/tools/plugandpaint/plugandpaint.pro b/examples/widgets/tools/plugandpaint/plugandpaint.pro index 965eacf388..f7da8a52bd 100644 --- a/examples/widgets/tools/plugandpaint/plugandpaint.pro +++ b/examples/widgets/tools/plugandpaint/plugandpaint.pro @@ -1,23 +1,4 @@ -#! [0] -QT += widgets +TEMPLATE = subdirs +SUBDIRS = plugins app -HEADERS = interfaces.h \ - mainwindow.h \ - paintarea.h \ - plugindialog.h -SOURCES = main.cpp \ - mainwindow.cpp \ - paintarea.cpp \ - plugindialog.cpp - -LIBS = -Lplugins -lpnp_basictools - -if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { - mac:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)_debug - win32:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)d -} -#! [0] - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/plugandpaint -INSTALLS += target +app.depends = plugins diff --git a/examples/widgets/tools/plugandpaintplugins/basictools/basictools.json b/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.json index 0967ef424b..0967ef424b 100644 --- a/examples/widgets/tools/plugandpaintplugins/basictools/basictools.json +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.json diff --git a/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro b/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.pro index 670ebb5709..f28be96b03 100644 --- a/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.pro @@ -2,13 +2,15 @@ TEMPLATE = lib CONFIG += plugin static QT += widgets -INCLUDEPATH += ../.. +INCLUDEPATH += ../../app HEADERS = basictoolsplugin.h SOURCES = basictoolsplugin.cpp TARGET = $$qtLibraryTarget(pnp_basictools) -DESTDIR = ../../plugandpaint/plugins +DESTDIR = ../../plugins #! [0] # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/plugandpaint/plugins INSTALLS += target + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp index c929ff6922..c929ff6922 100644 --- a/examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp diff --git a/examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.h b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h index 2c159d3e37..6e6d639d12 100644 --- a/examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.h +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h @@ -51,6 +51,9 @@ #ifndef BASICTOOLSPLUGIN_H #define BASICTOOLSPLUGIN_H +//! [0] +#include <interfaces.h> + #include <QRect> #include <QObject> #include <QtPlugin> @@ -58,9 +61,6 @@ #include <QPainterPath> #include <QImage> -//! [0] -#include <plugandpaint/interfaces.h> - //! [1] class BasicToolsPlugin : public QObject, public BrushInterface, diff --git a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.json b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.json index 0967ef424b..0967ef424b 100644 --- a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.json +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.json diff --git a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.pro index aa0ead87bc..deb3c5e70e 100644 --- a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.pro @@ -2,13 +2,15 @@ TEMPLATE = lib CONFIG += plugin QT += widgets -INCLUDEPATH += ../.. +INCLUDEPATH += ../../app HEADERS = extrafiltersplugin.h SOURCES = extrafiltersplugin.cpp TARGET = $$qtLibraryTarget(pnp_extrafilters) -DESTDIR = ../../plugandpaint/plugins +DESTDIR = ../../plugins #! [0] # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/plugandpaint/plugins INSTALLS += target + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp index 8f59afa759..8f59afa759 100644 --- a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp diff --git a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.h index b4cc02fb55..4beac9a7fb 100644 --- a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.h @@ -52,13 +52,13 @@ #define EXTRAFILTERSPLUGIN_H //! [0] +#include <interfaces.h> + #include <QObject> #include <QtPlugin> #include <QStringList> #include <QImage> -#include <plugandpaint/interfaces.h> - class ExtraFiltersPlugin : public QObject, public FilterInterface { Q_OBJECT diff --git a/examples/widgets/tools/plugandpaintplugins/plugandpaintplugins.pro b/examples/widgets/tools/plugandpaint/plugins/plugins.pro index e15220c621..e15220c621 100644 --- a/examples/widgets/tools/plugandpaintplugins/plugandpaintplugins.pro +++ b/examples/widgets/tools/plugandpaint/plugins/plugins.pro diff --git a/examples/widgets/tools/styleplugin/plugin/plugin.pro b/examples/widgets/tools/styleplugin/plugin/plugin.pro index c7e8de6ee2..35184fc82a 100644 --- a/examples/widgets/tools/styleplugin/plugin/plugin.pro +++ b/examples/widgets/tools/styleplugin/plugin/plugin.pro @@ -20,3 +20,5 @@ EXAMPLE_FILES += simplestyle.json # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/styleplugin/styles INSTALLS += target + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/widgets/tools/styleplugin/styleplugin.pro b/examples/widgets/tools/styleplugin/styleplugin.pro index b9f251116d..4f120637b0 100644 --- a/examples/widgets/tools/styleplugin/styleplugin.pro +++ b/examples/widgets/tools/styleplugin/styleplugin.pro @@ -1,7 +1,3 @@ TEMPLATE = subdirs SUBDIRS = stylewindow \ plugin - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/styleplugin -INSTALLS += target diff --git a/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro b/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro index 56aa373b0e..cdc1bd2fda 100644 --- a/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro +++ b/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro @@ -15,3 +15,5 @@ win32 { # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/styleplugin INSTALLS += target + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/widgets/tools/tools.pro b/examples/widgets/tools/tools.pro index 503efa8403..f3cbd73d98 100644 --- a/examples/widgets/tools/tools.pro +++ b/examples/widgets/tools/tools.pro @@ -5,7 +5,6 @@ SUBDIRS = \ customcompleter \ echoplugin \ i18n \ - plugandpaintplugins \ plugandpaint \ regexp \ regularexpression \ @@ -17,12 +16,9 @@ SUBDIRS = \ contains(DEFINES, QT_NO_TRANSLATION): SUBDIRS -= i18n -plugandpaint.depends = plugandpaintplugins - load(qfeatures) contains(QT_DISABLED_FEATURES, library) { SUBDIRS -= \ echoplugin \ - plugandpaintplugins \ plugandpaint } |