diff options
author | Nico Vertriest <nico.vertriest@qt.io> | 2021-01-22 16:18:42 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-02-18 07:42:52 +0100 |
commit | 36017b089439e22adda55e039e9a91346feff223 (patch) | |
tree | 65fa40f61e5f1646f61ece0ff5361cdbe32d6771 | |
parent | ef973d277b869275fa07543d7e0701668d43a0f5 (diff) |
Revert "Remove the qmake project files" for snippets
This reverts a limited part of commit ad2da2d27a590333fc89a56fc58700a09c3017b3
that deleted .pro files for snippets compilation.
Some .pro files which contain snippets used in the documentation
itself should be restored.
Task-number: QTBUG-90483
Change-Id: I1b03833c8ff17b5fca43a5b6c5417e8545b1711b
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
(cherry picked from commit 3183673303f6e66a02a7fbd25f4df2da8e979cc5)
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
7 files changed, 24 insertions, 0 deletions
diff --git a/src/concurrent/doc/snippets/snippets.pro b/src/concurrent/doc/snippets/snippets.pro new file mode 100644 index 0000000000..6e99051951 --- /dev/null +++ b/src/concurrent/doc/snippets/snippets.pro @@ -0,0 +1,3 @@ +#! [qmake_use] +QT += concurrent +#! [qmake_use] diff --git a/src/corelib/doc/snippets/code/doc_src_qplugin.pro b/src/corelib/doc/snippets/code/doc_src_qplugin.pro new file mode 100644 index 0000000000..52fb9e3163 --- /dev/null +++ b/src/corelib/doc/snippets/code/doc_src_qplugin.pro @@ -0,0 +1,4 @@ +#! [3] +TEMPLATE = app +QTPLUGIN += qjpeg qgif # image formats +#! [3] diff --git a/src/corelib/doc/snippets/code/src_corelib_kernel_qabstractnativeeventfilter.pro b/src/corelib/doc/snippets/code/src_corelib_kernel_qabstractnativeeventfilter.pro new file mode 100644 index 0000000000..8f447be514 --- /dev/null +++ b/src/corelib/doc/snippets/code/src_corelib_kernel_qabstractnativeeventfilter.pro @@ -0,0 +1,5 @@ +#! [0] +HEADERS += mycocoaeventfilter.h +OBJECTIVE_SOURCES += mycocoaeventfilter.mm +LIBS += -framework AppKit +#! [0] diff --git a/src/corelib/doc/snippets/resource-system/application.pro b/src/corelib/doc/snippets/resource-system/application.pro new file mode 100644 index 0000000000..ecf4ce1093 --- /dev/null +++ b/src/corelib/doc/snippets/resource-system/application.pro @@ -0,0 +1,3 @@ +#! [0] +RESOURCES = application.qrc +#! [0] diff --git a/src/gui/doc/snippets/code/doc_src_qtgui.pro b/src/gui/doc/snippets/code/doc_src_qtgui.pro new file mode 100644 index 0000000000..a5eb5b576c --- /dev/null +++ b/src/gui/doc/snippets/code/doc_src_qtgui.pro @@ -0,0 +1,3 @@ +#! [1] +QT -= gui +#! [1] diff --git a/src/network/doc/snippets/network/network.pro b/src/network/doc/snippets/network/network.pro new file mode 100644 index 0000000000..a100943e58 --- /dev/null +++ b/src/network/doc/snippets/network/network.pro @@ -0,0 +1,3 @@ +#! [0] +QT += network +#! [0] diff --git a/src/opengl/doc/snippets/snippets.pro b/src/opengl/doc/snippets/snippets.pro new file mode 100644 index 0000000000..4f7b547851 --- /dev/null +++ b/src/opengl/doc/snippets/snippets.pro @@ -0,0 +1,3 @@ +#! [qmake_use] +QT += opengl +#! [qmake_use] |