diff options
| -rw-r--r-- | doc/api/coding-style.qdoc | 6 | ||||
| -rw-r--r-- | doc/api/getting-and-building.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/howto/qtcreator-faq.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/overview/creator-tech-support.qdoc | 16 | ||||
| -rw-r--r-- | doc/src/projects/creator-projects-debuggers.qdoc | 15 |
5 files changed, 18 insertions, 28 deletions
diff --git a/doc/api/coding-style.qdoc b/doc/api/coding-style.qdoc index caf33b2d0ac..007bf6463b2 100644 --- a/doc/api/coding-style.qdoc +++ b/doc/api/coding-style.qdoc @@ -59,7 +59,7 @@ the philosophy behind Qt development. For more information about how to set up the development environment for working on Qt Creator and how to submit code and documentation for inclusion, see - \l{http://wiki.qt-project.org/index.php/Main_Page}{Guidelines for Contributions to the Qt Project}. + \l{https://wiki.qt.io/Qt_Contribution_Guidelines}{Qt Contribution Guidelines}. \section1 Binary and Source Compatibility @@ -109,7 +109,7 @@ \li Do not reimplement functions (not even inlines, nor protected or private functions). \li Check - \l {http://wiki.qt-project.org/index.php/Binary_Compatibility_Workarounds}{Binary Compatibility Workarounds} + \l {https://wiki.qt.io/Binary_Compatibility_Workarounds}{Binary Compatibility Workarounds} for ways to preserve binary compatibility. \endlist @@ -640,7 +640,7 @@ \target coding-rules-namespacing \section2 Namespacing - Read \l {http://wiki.qt-project.org/index.php/Qt_In_Namespace}{Qt In Namespace} + Read \l{https://wiki.qt.io/Qt_In_Namespace}{Qt In Namespace} and keep in mind that all of Qt Creator is \e{namespace aware} code. The namespacing policy within Qt Creator is as follows: diff --git a/doc/api/getting-and-building.qdoc b/doc/api/getting-and-building.qdoc index 31baf943c63..29002b03bb4 100644 --- a/doc/api/getting-and-building.qdoc +++ b/doc/api/getting-and-building.qdoc @@ -37,8 +37,7 @@ (You can find the current version in our source repository here: \l{http://qt.gitorious.org/qt-creator/qt-creator/blobs/master/qtcreator.pro}.) - You can get prebuilt Qt packages from the - \l{https://download.qt-project.org/official_releases/qt/}{Qt Project download page}. + You can get prebuilt Qt packages from \l{https://download.qt.io}{Qt Downloads}. If you want to use Qt as provided by your Linux distribution, you need to make sure that all Qt development packages and private header packages are also installed. @@ -48,7 +47,7 @@ released source bundles, or from the Gitorious repository \l{http://qt.gitorious.org/qt-creator}. If you intend to contribute to \QC itself, you should use the repository from our Gerrit review tool as described - in the developer wiki here: \l{http://wiki.qt-project.org/Setting_up_Gerrit}. + in: \l{https://wiki.qt.io/Setting_up_Gerrit}{Setting up Gerrit}. We strongly encourage you to do out-of-source builds of \QC (also called shadow-builds). diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc index 7451082423e..9ac5727c625 100644 --- a/doc/src/howto/qtcreator-faq.qdoc +++ b/doc/src/howto/qtcreator-faq.qdoc @@ -191,7 +191,7 @@ installed when you install \QC and \QSDK. On OS X, GDB is no longer officially supported. To build your own Python-enabled GDB, follow the instructions in - \l{http://wiki.qt.io/QtCreator_Build_Gdb}{Building GDB}. + \l{https://wiki.qt.io/QtCreator_Build_Gdb}{Building GDB}. You must use Python version 2.6 or 2.7. @@ -220,7 +220,7 @@ On Windows, nmake does not support the \c{-j} parameter. Instead, we provide a drop-in replacement called jom. You can download a precompiled - version of jom from \l{http://releases.qt-project.org/jom/}{Qt Project Release server}. + version of jom from \l{https://download.qt.io/official_releases/jom/}{Qt Downloads}. Put jom.exe in a location in the %PATH%. Go to the \uicontrol {Build Settings} and set jom.exe as the make command. diff --git a/doc/src/overview/creator-tech-support.qdoc b/doc/src/overview/creator-tech-support.qdoc index ed040f578f2..a3587406392 100644 --- a/doc/src/overview/creator-tech-support.qdoc +++ b/doc/src/overview/creator-tech-support.qdoc @@ -40,24 +40,28 @@ \li Where to Go \row - \li Learn more about Qt - \li \l{http://wiki.qt.io/developer_guides} - {Qt Developer Guides} + \li View examples of what you can do with Qt + \li \l{https://doc.qt.io/qt-5/all-examples.html}{List of Qt Examples} + + \l{https://doc.qt.io/qt-5/qtquick-codesamples.html} + {List of Qt Quick Examples} \row \li Develop Qt applications for desktop and mobile devices - \li \l{http://qt-project.org}{Qt Developer Network} + \li \l{https://www.qt.io/developers/}{Qt Developers} \row \li Participate in Qt development - \li \l{http://qt-project.org/contribute}{Contribute to Qt} + \li \l{https://wiki.qt.io/Qt_Contribution_Guidelines} + {Qt Contribution Guidelines} \row \li Find free Qt-based applications \li \l{http://qt-apps.org/}{Qt Apps} \row - \li Develop with a commercial Qt license and support - Qt by The Qt Company + \li Develop with a commercial Qt license and support - + Qt by The Qt Company \li \l{http://qt.io/licensing/}{Qt Licensing} \endtable diff --git a/doc/src/projects/creator-projects-debuggers.qdoc b/doc/src/projects/creator-projects-debuggers.qdoc index 4158039f515..51bb7fe3f12 100644 --- a/doc/src/projects/creator-projects-debuggers.qdoc +++ b/doc/src/projects/creator-projects-debuggers.qdoc @@ -58,20 +58,7 @@ \li For GDB, specify the path to the GDB executable. The executable must be built with Python scripting support - enabled. The options you - have depend on the development and target platform: - - \list - - \li For debugging on embedded devices using a different ABI, - you must provide a special executable. - - \li For debugging on Windows using MinGW, select a Windows - executable of GDB with Python scripting enabled. You can - download it from - \l{http://builds.qt-project.org/job/gdb-windows}. - - \endlist + enabled. \li For LLDB (experimental), specify the path to the LLDB executable. |