summaryrefslogtreecommitdiffstats
path: root/src/widgets/doc/snippets
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2020-09-22 07:45:05 +0200
committerPaul Wicking <paul.wicking@qt.io>2020-09-23 16:59:07 +0200
commitf4ee89363ec40cac2b29cf0677e7655c45739a7f (patch)
treed74341f3045ab574e55cd3f5f59d2404f88010ac /src/widgets/doc/snippets
parent270c3dced7e2ef6d6ac8441ab913b4ccfceaf701 (diff)
Doc: Make widgets snippets a subdirs/lib project
Task-number: QTBUG-86497 Pick-to: 5.15 Change-Id: Ia43f9eb3bf8a3d2f6e76a1932179aaa94266540b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/widgets/doc/snippets')
-rw-r--r--src/widgets/doc/snippets/customviewstyle/customviewstyle.cpp2
-rw-r--r--src/widgets/doc/snippets/customviewstyle/customviewstyle.pro10
-rw-r--r--src/widgets/doc/snippets/filedialogurls/filedialogurls.pro6
-rw-r--r--src/widgets/doc/snippets/graphicssceneadditem/graphicssceneadditem.pro6
-rw-r--r--src/widgets/doc/snippets/graphicsview/graphicsview.cpp15
-rw-r--r--src/widgets/doc/snippets/graphicsview/graphicsview.pro6
-rw-r--r--src/widgets/doc/snippets/mdiarea/mdiarea.pro7
-rw-r--r--src/widgets/doc/snippets/mdiarea/mdiareasnippets.cpp22
-rw-r--r--src/widgets/doc/snippets/myscrollarea/myscrollarea.pro7
-rw-r--r--src/widgets/doc/snippets/snippets.pro22
10 files changed, 62 insertions, 41 deletions
diff --git a/src/widgets/doc/snippets/customviewstyle/customviewstyle.cpp b/src/widgets/doc/snippets/customviewstyle/customviewstyle.cpp
index 1e4cf2b711..1523c5db5e 100644
--- a/src/widgets/doc/snippets/customviewstyle/customviewstyle.cpp
+++ b/src/widgets/doc/snippets/customviewstyle/customviewstyle.cpp
@@ -50,7 +50,7 @@
#include <QtWidgets>
-#include "./customstyle/customstyle.h"
+#include "../customstyle/customstyle.h"
void CustomStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option,
QPainter *painter, const QWidget *widget) const
diff --git a/src/widgets/doc/snippets/customviewstyle/customviewstyle.pro b/src/widgets/doc/snippets/customviewstyle/customviewstyle.pro
new file mode 100644
index 0000000000..9b09e5e4f3
--- /dev/null
+++ b/src/widgets/doc/snippets/customviewstyle/customviewstyle.pro
@@ -0,0 +1,10 @@
+TEMPLATE = lib
+TARGET = widgets_customviewstyle_snippets
+QT = core widgets
+
+HEADERS = \
+ ../customstyle/customstyle.h
+
+SOURCES = \
+ customviewstyle.cpp
+ ../customstyle/customstyle.cpp
diff --git a/src/widgets/doc/snippets/filedialogurls/filedialogurls.pro b/src/widgets/doc/snippets/filedialogurls/filedialogurls.pro
new file mode 100644
index 0000000000..f48b07a14a
--- /dev/null
+++ b/src/widgets/doc/snippets/filedialogurls/filedialogurls.pro
@@ -0,0 +1,6 @@
+TEMPLATE = lib
+TARGET = widgets_filedialogurls_snippets
+QT = core widgets
+
+SOURCES = \
+ filedialogurls.cpp
diff --git a/src/widgets/doc/snippets/graphicssceneadditem/graphicssceneadditem.pro b/src/widgets/doc/snippets/graphicssceneadditem/graphicssceneadditem.pro
new file mode 100644
index 0000000000..8abaa0b1be
--- /dev/null
+++ b/src/widgets/doc/snippets/graphicssceneadditem/graphicssceneadditem.pro
@@ -0,0 +1,6 @@
+TEMPLATE = lib
+TARGET = widgets_graphicssceneadditem_snippets
+QT = core widgets
+
+SOURCES = \
+ graphicssceneadditemsnippet.cpp
diff --git a/src/widgets/doc/snippets/graphicsview/graphicsview.cpp b/src/widgets/doc/snippets/graphicsview/graphicsview.cpp
index 29187ba326..b85c6fc169 100644
--- a/src/widgets/doc/snippets/graphicsview/graphicsview.cpp
+++ b/src/widgets/doc/snippets/graphicsview/graphicsview.cpp
@@ -47,14 +47,15 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include <QDrag>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsView>
-#include <QMimeData>
-#include <QOpenGLWidget>
-#include <QPrintDialog>
-#include <QPrinter>
#include <QStandardItem>
+#include <QtCore/qmimedata.h>
+#include <QtGui/qdrag.h>
+#include <QtOpenGLWidgets/qopenglwidget.h>
+#include <QtPrintSupport/qprintdialog.h>
+#include <QtPrintSupport/qprinter.h>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
+#include <QtWidgets/qdialog.h>
+#include <QtWidgets/qgraphicsview.h>
void graphicsview_snippet_main()
{
diff --git a/src/widgets/doc/snippets/graphicsview/graphicsview.pro b/src/widgets/doc/snippets/graphicsview/graphicsview.pro
new file mode 100644
index 0000000000..a76ceb149c
--- /dev/null
+++ b/src/widgets/doc/snippets/graphicsview/graphicsview.pro
@@ -0,0 +1,6 @@
+TEMPLATE = lib
+TARGET = widgets_graphicsview_snippets
+QT = core widgets printsupport openglwidgets
+
+SOURCES = \
+ graphicsview.cpp
diff --git a/src/widgets/doc/snippets/mdiarea/mdiarea.pro b/src/widgets/doc/snippets/mdiarea/mdiarea.pro
new file mode 100644
index 0000000000..23c5682999
--- /dev/null
+++ b/src/widgets/doc/snippets/mdiarea/mdiarea.pro
@@ -0,0 +1,7 @@
+TEMPLATE = lib
+TARGET = mdiarea_snippets
+QT += printsupport opengl openglwidgets
+
+SOURCES = \
+ mdiareasnippets.cpp
+
diff --git a/src/widgets/doc/snippets/mdiarea/mdiareasnippets.cpp b/src/widgets/doc/snippets/mdiarea/mdiareasnippets.cpp
index c1e2d37ccb..e554b85b74 100644
--- a/src/widgets/doc/snippets/mdiarea/mdiareasnippets.cpp
+++ b/src/widgets/doc/snippets/mdiarea/mdiareasnippets.cpp
@@ -84,25 +84,3 @@ void addingSubWindowsExample()
mdiArea.show();
}
-
-/*
-int main(int argv, char **args)
-{
- QApplication app(argv, args);
-
- mainWindowExample();
- //addingSubWindowsExample();
-
- QAction *act = new QAction(qApp);
- act->setShortcut(Qt::ALT + Qt::Key_S);
- act->setShortcutContext( Qt::ApplicationShortcut );
- QObject::connect(act, &QAction::triggered, qApp, &QApplication::aboutQt);
-
- QWidget widget5;
- widget5.show();
- widget5.addAction(act);
-
- return app.exec();
-}
-*/
-
diff --git a/src/widgets/doc/snippets/myscrollarea/myscrollarea.pro b/src/widgets/doc/snippets/myscrollarea/myscrollarea.pro
new file mode 100644
index 0000000000..190e4b0fa7
--- /dev/null
+++ b/src/widgets/doc/snippets/myscrollarea/myscrollarea.pro
@@ -0,0 +1,7 @@
+TEMPLATE = lib
+TARGET = myscrollarea_snippets
+QT += widgets
+
+SOURCES = \
+ myscrollarea.cpp
+
diff --git a/src/widgets/doc/snippets/snippets.pro b/src/widgets/doc/snippets/snippets.pro
index 55b690b469..d8c1c9fa5f 100644
--- a/src/widgets/doc/snippets/snippets.pro
+++ b/src/widgets/doc/snippets/snippets.pro
@@ -1,18 +1,18 @@
-TEMPLATE = lib
-
+TEMPLATE = subdirs
TARGET = widgets_snippets
+SUBDIRS =
#! [qmake_use]
QT += widgets
#! [qmake_use]
-QT += printsupport opengl openglwidgets
-
-SOURCES += customviewstyle/customviewstyle.cpp \
- filedialogurls/filedialogurls.cpp \
- graphicssceneadditem/graphicssceneadditemsnippet.cpp \
- graphicsview/graphicsview.cpp \
- mdiarea/mdiareasnippets.cpp \
- myscrollarea/myscrollarea.cpp
+contains(QT_BUILD_PARTS, tests) {
+ SUBDIRS += \
+ customviewstyle \
+ filedialogurls \
+ graphicssceneadditem \
+ graphicsview \
+ mdiarea \
+ myscrollarea
+}
-load(qt_common)