diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-09 01:00:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-09 13:06:11 +0000 |
| commit | e56d3b03ed92743f33eb7ca1a5aa61dbdedaf19b (patch) | |
| tree | c29a80a940cca1281014732aff4237c915f32dc4 /src/gui/doc/snippets | |
| parent | 2a79af6b5c67eba6f967c7443bf73bbe11206a62 (diff) | |
| parent | 9444416a46ee0e6bb0d9d9be9a4883b388644c59 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/corelib/tools/qlocale_data_p.h
(Regenerated by running the scripts in util/local_database/)
src/gui/opengl/qopengltextureuploader.cpp
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: I12df7f066ed0a25eb109f61c4b8d8dea63b683e2
Diffstat (limited to 'src/gui/doc/snippets')
| -rw-r--r-- | src/gui/doc/snippets/code/doc_src_qtgui.pro | 4 | ||||
| -rw-r--r-- | src/gui/doc/snippets/overview/using-qt-gui.cmake | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/doc/snippets/code/doc_src_qtgui.pro b/src/gui/doc/snippets/code/doc_src_qtgui.pro index e705555336..a5eb5b576c 100644 --- a/src/gui/doc/snippets/code/doc_src_qtgui.pro +++ b/src/gui/doc/snippets/code/doc_src_qtgui.pro @@ -1,7 +1,3 @@ -#! [0] -#include <QtGui> -#! [0] - #! [1] QT -= gui #! [1] diff --git a/src/gui/doc/snippets/overview/using-qt-gui.cmake b/src/gui/doc/snippets/overview/using-qt-gui.cmake new file mode 100644 index 0000000000..aecfa458a0 --- /dev/null +++ b/src/gui/doc/snippets/overview/using-qt-gui.cmake @@ -0,0 +1,2 @@ +find_package(Qt5 COMPONENTS Gui REQUIRED) +target_link_libraries(mytarget Qt5::Gui) |