diff options
author | Eike Ziller <eike.ziller@qt.io> | 2023-04-24 08:52:35 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2023-04-24 08:52:35 +0200 |
commit | c9696fbabbb435b9728a16c80e9aa686926e3be0 (patch) | |
tree | e7f73fba166c2d5eb81529f3c644c8b2d1516ade /doc | |
parent | bb9ba4349af79519a72f36148d68fd65761162f2 (diff) | |
parent | 05f80a132d38c34c747108192858b136870be789 (diff) | |
download | qt-creator-c9696fbabbb435b9728a16c80e9aa686926e3be0.tar.gz |
Merge remote-tracking branch 'origin/10.0'
Change-Id: I8b36c1812b61dbe08fe3e7930f950e6b8e8a7079
Diffstat (limited to 'doc')
-rw-r--r-- | doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc | 4 | ||||
-rw-r--r-- | doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc index 6a1d6a1227..b2dc857e45 100644 --- a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc +++ b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc @@ -1,4 +1,4 @@ -// Copyright (C) 2021 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! @@ -219,7 +219,7 @@ Ubuntu or Debian?} \code - sudo apt-get install libglib2.0-dev libSM-dev libxrender-dev libfontconfig1-dev libxext-dev + sudo apt-get install libglib2.0-dev libsm-dev libxrender-dev libfontconfig1-dev libxext-dev \endcode If you use QtOpenGL, you also need: diff --git a/doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc index 4cdf397d1f..d97f7073cd 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc @@ -1,4 +1,4 @@ -// Copyright (C) 2020 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! @@ -30,7 +30,7 @@ \li g++ \li make \li libglib2.0-dev - \li libSM-dev + \li libsm-dev \li libxrender-dev \li libfontconfig1-dev \li libxext-dev |