diff options
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | dist/gdb/Makefile.mingw | 2 | ||||
-rw-r--r-- | share/qtcreator/translations/README | 4 | ||||
-rw-r--r-- | share/qtcreator/welcomescreen/widgets/SideBar.qml | 4 | ||||
-rw-r--r-- | src/plugins/android/androidsettingswidget.cpp | 4 | ||||
-rw-r--r-- | src/plugins/projectexplorer/projectexplorersettingspage.ui | 2 | ||||
-rwxr-xr-x | tests/system/suite_WELP/tst_WELP01/test.py | 4 |
7 files changed, 11 insertions, 11 deletions
@@ -88,7 +88,7 @@ http://wiki.qt.io/Building_Qt_5_from_Git . For the Visual C++ compilers, it is recommended to use the tool 'jom'. It is a replacement for nmake that utilizes all CPU cores and thus speeds up compilation significantly. Download it from - http://download.qt-project.org/official_releases/jom + http://download.qt.io/official_releases/jom and add the executable to the path. 8. For convenience, we recommend creating shell prompts with the correct diff --git a/dist/gdb/Makefile.mingw b/dist/gdb/Makefile.mingw index 3d23a97173..54e9feadde 100644 --- a/dist/gdb/Makefile.mingw +++ b/dist/gdb/Makefile.mingw @@ -36,7 +36,7 @@ checkunzip: ${source}/python.zip: | makesourcedir checkwget cd ${source} && \ echo "Downloading python..." && \ - wget -q http://download.qt-project.org/development_releases/prebuilt/gdb/build-prerequisites/python.zip && \ + wget -q http://download.qt.io/development_releases/prebuilt/gdb/build-prerequisites/python.zip && \ touch python.zip ${broot}/python/python.exe: ${source}/python.zip | checkunzip diff --git a/share/qtcreator/translations/README b/share/qtcreator/translations/README index 84d3ae04e7..2c38a2d07e 100644 --- a/share/qtcreator/translations/README +++ b/share/qtcreator/translations/README @@ -3,7 +3,7 @@ How To add translations to Qt Creator - Coordinate over the mailing list to avoid duplicate work. -- Read the instructions at http://wiki.qt-project.org/Qt_Localization +- Read the instructions at http://wiki.qt.io/Qt_Localization - Add your language to the LANGUAGES line in translations.pro. Don't qualify it with a country unless it is reasonable to expect @@ -29,7 +29,7 @@ How To add translations to Qt Creator - Run "make commit-ts" to create a commit with a cleaned .ts file - If needed, amend the commit with the modified .pro file -- Follow http://wiki.qt-project.org/Qt_Contribution_Guidelines to post the +- Follow http://wiki.qt.io/Qt_Contribution_Guidelines to post the change for review. - .qm files are generated as part of the regular build. diff --git a/share/qtcreator/welcomescreen/widgets/SideBar.qml b/share/qtcreator/welcomescreen/widgets/SideBar.qml index 613b92b2f1..5a552bfa99 100644 --- a/share/qtcreator/welcomescreen/widgets/SideBar.qml +++ b/share/qtcreator/welcomescreen/widgets/SideBar.qml @@ -180,12 +180,12 @@ ColumnLayout { IconAndLink { iconSource: "images/icons/onlineCommunity.png" title: qsTr("Online Community") - openUrl: "http://qt-project.org/forums" + openUrl: "http://forum.qt.io" } IconAndLink { iconSource: "images/icons/blogs.png" title: qsTr("Blogs") - openUrl: "http://planet.qt-project.org" + openUrl: "http://planet.qt.io" } IconAndLink { iconSource: "images/icons/userGuide.png" diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 6b34cd9c67..9274f93782 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -636,8 +636,8 @@ void AndroidSettingsWidget::showGdbWarningDialog() tr("Unsupported GDB"), tr("The GDB inside this NDK seems to not support Python. " "The Qt Project offers fixed GDB builds at: " - "<a href=\"http://download.qt-project.org/official_releases/gdb/\">" - "http://download.qt-project.org/official_releases/gdb/</a>")); + "<a href=\"http://download.qt.io/official_releases/gdb/\">" + "http://download.qt.io/official_releases/gdb/</a>")); } void AndroidSettingsWidget::manageAVD() diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui index 2b1b040750..0c3d4259d3 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.ui +++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui @@ -200,7 +200,7 @@ <item> <widget class="QLabel" name="jomLabel"> <property name="text"> - <string><i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. The latest binary is available at <a href="http://download.qt-project.org/official_releases/jom/">http://download.qt-project.org/official_releases/jom/</a>. Disable it if you experience problems with your builds.</string> + <string><i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. The latest binary is available at <a href="http://download.qt.io/official_releases/jom/">http://download.qt.io/official_releases/jom/</a>. Disable it if you experience problems with your builds.</string> </property> <property name="wordWrap"> <bool>true</bool> diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py index bf87d76473..c63b3ecf80 100755 --- a/tests/system/suite_WELP/tst_WELP01/test.py +++ b/tests/system/suite_WELP/tst_WELP01/test.py @@ -90,8 +90,8 @@ def main(): testDetails = "Verifying: Help with Creator Documentation is being opened." clickItemVerifyHelpCombo(gettingStartedText, expectedText, testDetails) - textUrls = {'Online Community':'http://qt-project.org/forums', - 'Blogs':'http://planet.qt-project.org', + textUrls = {'Online Community':'http://forum.qt.io', + 'Blogs':'http://planet.qt.io', 'Qt Account':'https://account.qt.io', 'Qt Cloud Services':'https://developer.qtcloudservices.com', 'User Guide':'qthelp://org.qt-project.qtcreator/doc/index.html' |