diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-13 08:04:58 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-13 08:04:58 +0200 |
commit | 388fe97f2a54089544dff0ed3af6ca70bf604716 (patch) | |
tree | 163b47974c625849726804337bd667c942dfbc77 /src/gui/doc/snippets | |
parent | a0c4b6f34546bdd22167a76a0540d37e9a37c0cf (diff) | |
parent | 591116490cf313808e8ba05ddd066656a1d1a566 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I81dbf90fc936c9bf08197baefa071117bddb1c63
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) |