Doc: Make widgets snippets a subdirs/lib project

Task-number: QTBUG-86497 Pick-to: 5.15 Change-Id: Ia43f9eb3bf8a3d2f6e76a1932179aaa94266540b Reviewed-by: Joerg Bornemann <[email protected]>
blockspacer · Sep 23, 2020 · f4ee893 · f4ee893
1 parent 270c3dc
commit f4ee893
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 41 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)