diff options
Diffstat (limited to 'examples/widgets/painting')
9 files changed, 30 insertions, 36 deletions
diff --git a/examples/widgets/painting/basicdrawing/basicdrawing.pro b/examples/widgets/painting/basicdrawing/basicdrawing.pro index 52ee0d4402..a7b3cff9cd 100644 --- a/examples/widgets/painting/basicdrawing/basicdrawing.pro +++ b/examples/widgets/painting/basicdrawing/basicdrawing.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = renderarea.h \ window.h SOURCES = main.cpp \ @@ -8,5 +10,3 @@ RESOURCES = basicdrawing.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/basicdrawing INSTALLS += target - -QT += widgets diff --git a/examples/widgets/painting/concentriccircles/concentriccircles.pro b/examples/widgets/painting/concentriccircles/concentriccircles.pro index 9690465d46..844c01a9c2 100644 --- a/examples/widgets/painting/concentriccircles/concentriccircles.pro +++ b/examples/widgets/painting/concentriccircles/concentriccircles.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = circlewidget.h \ window.h SOURCES = circlewidget.cpp \ @@ -7,6 +9,3 @@ SOURCES = circlewidget.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/concentriccircles INSTALLS += target - -QT += widgets - diff --git a/examples/widgets/painting/fontsampler/fontsampler.pro b/examples/widgets/painting/fontsampler/fontsampler.pro index c32fc40572..8325da0175 100644 --- a/examples/widgets/painting/fontsampler/fontsampler.pro +++ b/examples/widgets/painting/fontsampler/fontsampler.pro @@ -1,3 +1,6 @@ +QT += widgets +!isEmpty(QT.printsupport.name): QT += printsupport + FORMS = mainwindowbase.ui HEADERS = mainwindow.h SOURCES = main.cpp \ @@ -6,6 +9,3 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/fontsampler INSTALLS += target - -QT += widgets -!isEmpty(QT.printsupport.name): QT += printsupport diff --git a/examples/widgets/painting/imagecomposition/imagecomposition.pro b/examples/widgets/painting/imagecomposition/imagecomposition.pro index ce23c601f5..42c70471c1 100644 --- a/examples/widgets/painting/imagecomposition/imagecomposition.pro +++ b/examples/widgets/painting/imagecomposition/imagecomposition.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = imagecomposer.h SOURCES = imagecomposer.cpp \ main.cpp @@ -6,6 +8,3 @@ RESOURCES = imagecomposition.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/imagecomposition INSTALLS += target - -QT += widgets - diff --git a/examples/widgets/painting/painterpaths/painterpaths.pro b/examples/widgets/painting/painterpaths/painterpaths.pro index 560e84a267..2d2db30739 100644 --- a/examples/widgets/painting/painterpaths/painterpaths.pro +++ b/examples/widgets/painting/painterpaths/painterpaths.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = renderarea.h \ window.h SOURCES = main.cpp \ @@ -8,6 +10,3 @@ unix:!mac:!vxworks:!integrity:LIBS += -lm # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/painterpaths INSTALLS += target - -QT += widgets - diff --git a/examples/widgets/painting/painting.pro b/examples/widgets/painting/painting.pro index 145fcdd383..7459dd3e94 100644 --- a/examples/widgets/painting/painting.pro +++ b/examples/widgets/painting/painting.pro @@ -12,8 +12,6 @@ SUBDIRS = basicdrawing \ transformations \ fontsampler -QT += widgets - examples_affine.subdir = affine examples_composition.subdir = composition examples_deform.subdir = deform diff --git a/examples/widgets/painting/shared/shared.pri b/examples/widgets/painting/shared/shared.pri index 2d6b3c78f9..6aef1bdd5b 100644 --- a/examples/widgets/painting/shared/shared.pri +++ b/examples/widgets/painting/shared/shared.pri @@ -1,20 +1,19 @@ -INCLUDEPATH += $$SHARED_FOLDER +INCLUDEPATH += $$PWD -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} -contains(CONFIG, debug_and_release_target) { - CONFIG(debug, debug|release) { - QMAKE_LIBDIR += $$SHARED_FOLDER/debug - } else { - QMAKE_LIBDIR += $$SHARED_FOLDER/release - } -} else { - QMAKE_LIBDIR += $$SHARED_FOLDER +contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { + DEFINES += QT_OPENGL_SUPPORT + QT += opengl widgets } -hpux-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a -hpuxi-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a -!hpuxi-acc*:!hpux-acc*:LIBS += -ldemo_shared +SOURCES += \ + $$PWD/arthurstyle.cpp\ + $$PWD/arthurwidgets.cpp \ + $$PWD/hoverpoints.cpp + +HEADERS += \ + $$PWD/arthurstyle.h \ + $$PWD/arthurwidgets.h \ + $$PWD/hoverpoints.h + +RESOURCES += $$PWD/shared.qrc diff --git a/examples/widgets/painting/shared/shared.pro b/examples/widgets/painting/shared/shared.pro index 2a71c7d487..42b474a946 100644 --- a/examples/widgets/painting/shared/shared.pro +++ b/examples/widgets/painting/shared/shared.pro @@ -3,15 +3,15 @@ CONFIG += static contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { DEFINES += QT_OPENGL_SUPPORT - QT += opengl widgets + QT += opengl } +QT += widgets build_all:!build_pass { CONFIG -= build_all CONFIG += release } TARGET = demo_shared -QT += widgets SOURCES += \ arthurstyle.cpp\ diff --git a/examples/widgets/painting/transformations/transformations.pro b/examples/widgets/painting/transformations/transformations.pro index 72f42046db..3f5398a228 100644 --- a/examples/widgets/painting/transformations/transformations.pro +++ b/examples/widgets/painting/transformations/transformations.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = renderarea.h \ window.h SOURCES = main.cpp \ @@ -7,5 +9,3 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/transformations INSTALLS += target - -QT += widgets |