From 3af3fe7ad3e312a2923dfd18a8d527fccf5970f3 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 2 Mar 2015 14:06:12 +0100 Subject: [PATCH 1/3] Replace old qt-project.org wiki with wiki.qt.io Change-Id: Ie7518d57b62e3f0b9dc6c559fe4a8f5b0212bb43 Reviewed-by: Leena Miettinen --- README | 6 +++--- dist/appdata.xml | 2 +- doc/api/qtcreator-documentation.qdoc | 2 +- doc/src/debugger/creator-debugger-setup.qdoc | 2 +- doc/src/howto/qtcreator-faq.qdoc | 2 +- doc/src/overview/creator-tech-support.qdoc | 2 +- doc/src/qnx/creator-deployment-bb10.qdoc | 4 ++-- doc/src/qnx/creator-developing-bb10.qdoc | 2 +- src/plugins/debugger/debuggeroptionspage.cpp | 2 +- src/plugins/qnx/blackberryruncontrolfactory.cpp | 2 +- src/plugins/qnx/qnxconstants.h | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README b/README index 9da0707989f..74655f93c18 100644 --- a/README +++ b/README @@ -43,7 +43,7 @@ versions of Qt and Qt Creator on Windows. Alternatively, to avoid having to compile Qt yourself, you can use one of the versions of Qt shipped with the Qt SDK (release builds of Qt using MinGW and Visual C++ 2010 or later). For detailed information on the supported compilers, see -http://qt-project.org/wiki/Building_Qt_5_from_Git . +http://wiki.qt.io/Building_Qt_5_from_Git . 1. Decide which compiler to use: MinGW or Microsoft Visual Studio. If you plan to contribute to Qt Creator, you should compile your changes with @@ -75,7 +75,7 @@ http://qt-project.org/wiki/Building_Qt_5_from_Git . directory. 7. Install a compiler: - - For a MinGW toolchain for Qt, see http://qt-project.org/wiki/MinGW . + - For a MinGW toolchain for Qt, see http://wiki.qt.io/MinGW . - For Microsoft Visual C++, install the Windows SDK and the "Debugging Tools for Windows" from the SDK image. We strongly recommend using the @@ -122,7 +122,7 @@ http://qt-project.org/wiki/Building_Qt_5_from_Git . You have to remove it from the path. 10. You are now ready to configure and build Qt and Qt Creator. - Please see http://qt-project.org/wiki/Building_Qt_5_from_Git for + Please see http://wiki.qt.io/Building_Qt_5_from_Git for recommended configure-options for Qt 5. To use MinGW, open the the shell prompt and enter: diff --git a/dist/appdata.xml b/dist/appdata.xml index 017bbf9445d..685eba7aa73 100644 --- a/dist/appdata.xml +++ b/dist/appdata.xml @@ -23,6 +23,6 @@ http://qt-project.org/uploads/image_upload/qtcreator-edit-mode.png - https://qt-project.org/wiki/Category:Tools::QtCreator + https://wiki.qt.io/Category:Tools::QtCreator Qt diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/api/qtcreator-documentation.qdoc index 8c7bbd52bde..0d9fc3d3937 100644 --- a/doc/api/qtcreator-documentation.qdoc +++ b/doc/api/qtcreator-documentation.qdoc @@ -131,7 +131,7 @@ \section1 Writing Text Follow the guidelines for - \l{http://qt-project.org/wiki/Writing_Qt_Documentation} + \l{http://wiki.qt.io/Writing_Qt_Documentation} {writing Qt documentation}. The documentation must be grammatically correct English and use the standard diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc index cbb8d3db466..3ea650a4d80 100644 --- a/doc/src/debugger/creator-debugger-setup.qdoc +++ b/doc/src/debugger/creator-debugger-setup.qdoc @@ -181,7 +181,7 @@ versions of MinGW. On most Linux distributions the GDB builds shipped with the system are sufficient. You can also build your own. Follow the instructions in - \l{http://qt-project.org/wiki/QtCreatorBuildGdb} + \l{http://wiki.qt.io/QtCreator_Build_Gdb} {Building GDB}. Builds of GDB shipped with Xcode on OS X are no longer supported. diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc index ab99288517d..7451082423e 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://qt-project.org/wiki/QtCreatorBuildGdb}{Building GDB}. + \l{http://wiki.qt.io/QtCreator_Build_Gdb}{Building GDB}. You must use Python version 2.6 or 2.7. diff --git a/doc/src/overview/creator-tech-support.qdoc b/doc/src/overview/creator-tech-support.qdoc index b862606cbd9..ed040f578f2 100644 --- a/doc/src/overview/creator-tech-support.qdoc +++ b/doc/src/overview/creator-tech-support.qdoc @@ -41,7 +41,7 @@ \row \li Learn more about Qt - \li \l{http://qt-project.org/wiki/developer-guides} + \li \l{http://wiki.qt.io/developer_guides} {Qt Developer Guides} \row diff --git a/doc/src/qnx/creator-deployment-bb10.qdoc b/doc/src/qnx/creator-deployment-bb10.qdoc index a99fdd1ca65..224aa40ec49 100644 --- a/doc/src/qnx/creator-deployment-bb10.qdoc +++ b/doc/src/qnx/creator-deployment-bb10.qdoc @@ -84,7 +84,7 @@ filter, so you need to set this filter in the top-right corner of the \uicontrol {New} dialog to enable those templates. - \note Currently, the BlackBerry 10 devices and Simulator have Qt 4.8 libraries preinstalled. To use Qt 5 features, you must compile the Qt libraries for BlackBerry 10 yourself. For more information, see \l {http://qt-project.org/wiki/Building-Qt5-for-Blackberry}{http://qt-p roject.org/wiki/Building-Qt5-for-Blackberry}. + \note Currently, the BlackBerry 10 devices and Simulator have Qt 4.8 libraries preinstalled. To use Qt 5 features, you must compile the Qt libraries for BlackBerry 10 yourself. For more information, see \l {http://wiki.qt.io/Building_Qt5_for_Blackberry}{Building Qt5 for BlackBerry}. - For more details please refer to the Qt-Project wiki page: \l {http://qt-project.org/wiki/BlackBerry} {http://qt-project.org/wiki/BlackBerry}. + For more details please refer to the Qt-Project wiki page: \l {http://wiki.qt.io/BlackBerry}{Qt for BlackBerry}. */ diff --git a/doc/src/qnx/creator-developing-bb10.qdoc b/doc/src/qnx/creator-developing-bb10.qdoc index 54274f6ac95..d7b347d2472 100644 --- a/doc/src/qnx/creator-developing-bb10.qdoc +++ b/doc/src/qnx/creator-developing-bb10.qdoc @@ -120,5 +120,5 @@ \include qnx/creator-key-management-qnx.qdocinc - For more details please refer to the Qt-Project wiki page: \l {http://qt-project.org/wiki/BlackBerry} {http://qt-project.org/wiki/BlackBerry}. + For more details please refer to the Qt-Project wiki page: \l {http://wiki.qt.io/BlackBerry}{Qt for BlackBerry}. */ diff --git a/src/plugins/debugger/debuggeroptionspage.cpp b/src/plugins/debugger/debuggeroptionspage.cpp index d0b04a9b32c..b904cf50dc3 100644 --- a/src/plugins/debugger/debuggeroptionspage.cpp +++ b/src/plugins/debugger/debuggeroptionspage.cpp @@ -55,7 +55,7 @@ using namespace Utils; namespace Debugger { namespace Internal { -static const char debuggingToolsWikiLinkC[] = "http://qt-project.org/wiki/Qt_Creator_Windows_Debugging"; +static const char debuggingToolsWikiLinkC[] = "http://wiki.qt.io/Qt_Creator_Windows_Debugging"; // ----------------------------------------------------------------------- // DebuggerItemConfigWidget diff --git a/src/plugins/qnx/blackberryruncontrolfactory.cpp b/src/plugins/qnx/blackberryruncontrolfactory.cpp index 84008ddd496..0a721d3c619 100644 --- a/src/plugins/qnx/blackberryruncontrolfactory.cpp +++ b/src/plugins/qnx/blackberryruncontrolfactory.cpp @@ -139,7 +139,7 @@ ProjectExplorer::RunControl *BlackBerryRunControlFactory::create(ProjectExplorer if (qtVer && qtVer->qtVersion() <= QtSupport::QtVersionNumber(4, 8, 6)) Core::MessageManager::write(tr("Target Qt version (%1) might not support QML profiling. " "Cascades applications are not affected and should work as expected. " - "For more info see http://qt-project.org/wiki/Qt-Creator-with-BlackBerry-10") + "For more info see http://wiki.qt.io/Qt_Creator_with_BlackBerry_10") .arg(qtVer->qtVersionString()), Core::MessageManager::Flash ); diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h index 742091f9c77..d448808be3e 100644 --- a/src/plugins/qnx/qnxconstants.h +++ b/src/plugins/qnx/qnxconstants.h @@ -128,7 +128,7 @@ const char QNX_BLACKBERRY_DEFAULT_DEPLOY_QT_BASEPATH[] = "/accounts/devuser/"; const char QNX_OK_ICON[] = ":/qnx/images/ok.png"; -const char QNX_BLACKBERRY_SETUP_URL[] = "http://qt-project.org/wiki/Qt-Creator-with-BlackBerry-10"; +const char QNX_BLACKBERRY_SETUP_URL[] = "http://wiki.qt.io/Qt_Creator_with_BlackBerry_10"; const char QNX_LEGACY_KEYS_URL[] = "https://developer.blackberry.com/native/documentation/core" "/com.qnx.doc.ide.userguide/topic/signing_and_publishing.html"; const char QNX_REGISTER_KEYS_URL[] = "https://www.blackberry.com/SignedKeys/codesigning.html"; From 53a29f5b83b69a5861a252992a6a5e7659613cf1 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 3 Mar 2015 14:20:24 +0100 Subject: [PATCH 2/3] Doc: fix remaining links to Qt wiki in docs Change-Id: Ia9193cf1870241104bf099ad2e47e3ead4eb43fd Reviewed-by: hjk --- doc/api/coding-style.qdoc | 6 +++--- doc/api/getting-and-building.qdoc | 5 ++--- doc/src/howto/qtcreator-faq.qdoc | 4 ++-- doc/src/overview/creator-tech-support.qdoc | 16 ++++++++++------ 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. From 9b68aade38efa15316c6cf2193e77f9eaa2fd722 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 4 Mar 2015 12:43:09 +0100 Subject: [PATCH 3/3] Add changes-3.3.2 Change-Id: I660fe06a7949817c7516b9870dde264ee5d2088c Reviewed-by: Leena Miettinen --- dist/changes-3.3.2 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 dist/changes-3.3.2 diff --git a/dist/changes-3.3.2 b/dist/changes-3.3.2 new file mode 100644 index 00000000000..a77efcd45b2 --- /dev/null +++ b/dist/changes-3.3.2 @@ -0,0 +1,15 @@ +Qt Creator version 3.3.2 contains bug fixes. + +The most important changes are listed in this document. For a complete +list of changes, see the Git log for the Qt Creator sources that +you can check out from the public Git repository. For example: + +git clone git://gitorious.org/qt-creator/qt-creator.git +git log --cherry-pick --pretty=oneline v3.3.1..v3.3.2 + +C++ Support + * Fixed deployment of Clang code model plugin (QTCREATORBUG-14038) + +Qt Quick Designer + * Fixed crash of Qt Quick emulation layer when using fallback emulation + (QTCREATORBUG-14031)