From a9bb1c63dc12034ebac1dd9402c9719dca7a92e1 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 3 Mar 2015 11:27:28 +0100 Subject: [PATCH] Adjust wiki links to the new redirect it looks nicer this way Change-Id: I872976bdef5f581187a758aa92b02e2f5f32b130 Reviewed-by: Oswald Buddenhagen --- dist/README | 4 ++-- doc/README | 2 +- doc/global/externalsites/qt-webpages.qdoc | 12 ++++++------ doc/global/html-footer-online.qdocconf | 2 +- .../devices/linux-arm-trident-pnx8473-g++/qmake.conf | 2 +- mkspecs/devices/linux-rasp-pi-g++/qmake.conf | 2 +- .../devices/linux-sh4-stmicro-ST7108-g++/qmake.conf | 2 +- .../devices/linux-sh4-stmicro-ST7540-g++/qmake.conf | 2 +- mkspecs/devices/linux-snowball-g++/qmake.conf | 2 +- mkspecs/features/qt_headersclean.prf | 2 +- mkspecs/modules/README | 2 +- src/widgets/doc/src/modelview.qdoc | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dist/README b/dist/README index f0d2034001..f6e6775d6a 100644 --- a/dist/README +++ b/dist/README @@ -13,7 +13,7 @@ http://qt-project.org Be sure to check out the release notes, which will list any known problems or limitations of this version: -https://wiki.qt.io/?title=Category:Release +https://wiki.qt.io/Category:Release Overview @@ -101,7 +101,7 @@ Building Qt 5 from Source ------------------------- See //src/README and -http://wiki.qt.io/?title=Building_Qt_5_from_Git +http://wiki.qt.io/Building_Qt_5_from_Git for instructions on building Qt from source. diff --git a/doc/README b/doc/README index a00256d195..ed8410db71 100644 --- a/doc/README +++ b/doc/README @@ -106,4 +106,4 @@ More Information ================ For more information about Qt 5's documentation, refer to the Qt Project wiki: -http://wiki.qt.io/?title=Qt5DocumentationProject +http://wiki.qt.io/Qt5DocumentationProject diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index ec704cec62..e9fbe33bbf 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -58,7 +58,7 @@ */ /*! - \externalpage http://wiki.qt.io/?title=Qt_Coding_Style + \externalpage http://wiki.qt.io/Qt_Coding_Style \title Qt Coding Style */ /*! @@ -78,16 +78,16 @@ \title Pimp my video */ /*! - \externalpage http://wiki.qt.io/?title=QtMediaHub + \externalpage http://wiki.qt.io/QtMediaHub \title QtMediaHub */ /*! - \externalpage http://wiki.qt.io/?title=Qt_RaspberryPi + \externalpage http://wiki.qt.io/Qt_RaspberryPi \title QtonPi */ /*! - \externalpage http://wiki.qt.io/?title=jom + \externalpage http://wiki.qt.io/jom \title jom */ @@ -102,11 +102,11 @@ */ /*! - \externalpage http://wiki.qt.io/?title=Qt_Localization + \externalpage http://wiki.qt.io/Qt_Localization \title external: Translating Qt Into Other Languages */ /*! - \externalpage http://wiki.qt.io/?title=BlackBerry + \externalpage http://wiki.qt.io/BlackBerry \title Qt for BlackBerry */ diff --git a/doc/global/html-footer-online.qdocconf b/doc/global/html-footer-online.qdocconf index 6b3ea82968..0060fe69f6 100644 --- a/doc/global/html-footer-online.qdocconf +++ b/doc/global/html-footer-online.qdocconf @@ -38,7 +38,7 @@ HTML.footer += \ "
  • Tools
    • \n" \ "
  • Wiki
    • \n" \ "
  • Forums
    • \n" \ - "
  • Contribute to Qt
    • \n" \ + "
  • Contribute to Qt
    • \n" \ "\n" \ "\n" \ "
  • Services\n" \ diff --git a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf index a546a3ae18..3bbb7b6db9 100644 --- a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf +++ b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf @@ -1,7 +1,7 @@ # # qmake configuration for building with arm-linux-uclibcgnueabi-g++ # -# http://wiki.qt.io/?title=Shiner +# http://wiki.qt.io/Shiner # MAKEFILE_GENERATOR = UNIX diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf index 38e4b36cdd..c0e7ee4e9f 100644 --- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf +++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf @@ -1,6 +1,6 @@ # # qmake configuration for Broadcom's Raspberry PI -# http://wiki.qt.io/?title=RaspberryPi +# http://wiki.qt.io/RaspberryPi include(../common/linux_device_pre.conf) diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf index dc2b28a180..18d07dad63 100644 --- a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf +++ b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf @@ -1,7 +1,7 @@ # # qmake configuration for linux-g++ using the sh4-linux-g++ crosscompiler # -# http://wiki.qt.io/?title=ST7108 +# http://wiki.qt.io/ST7108 # MAKEFILE_GENERATOR = UNIX diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf index 9c28dd52c9..5672829da9 100644 --- a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf +++ b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf @@ -1,7 +1,7 @@ # # qmake configuration for linux-g++ using the sh4-linux-g++ crosscompiler # -# http://wiki.qt.io/?title=ST7540 +# http://wiki.qt.io/ST7540 # MAKEFILE_GENERATOR = UNIX diff --git a/mkspecs/devices/linux-snowball-g++/qmake.conf b/mkspecs/devices/linux-snowball-g++/qmake.conf index 99b9dc07f5..3520c7a922 100644 --- a/mkspecs/devices/linux-snowball-g++/qmake.conf +++ b/mkspecs/devices/linux-snowball-g++/qmake.conf @@ -1,6 +1,6 @@ # # qmake configuration for ST Ericsson's Snowball -# http://wiki.qt.io/?title=Snowball +# http://wiki.qt.io/Snowball MAKEFILE_GENERATOR = UNIX CONFIG += incremental diff --git a/mkspecs/features/qt_headersclean.prf b/mkspecs/features/qt_headersclean.prf index aae8d7c707..06a20ad2c0 100644 --- a/mkspecs/features/qt_headersclean.prf +++ b/mkspecs/features/qt_headersclean.prf @@ -7,7 +7,7 @@ *-g++*: QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -# The flags here come from http://wiki.qt.io/?title=Coding_Conventions#Conventions_for_public_header_files +# The flags here come from http://wiki.qt.io/Coding_Conventions#Conventions_for_public_header_files # -Wold-style-cast cannot be used, /usr/include/bits/byteswap.h defines the macro bswap_16 using C style casts :( # -Wfloat-equal cannot be used, qrect.h and qvector2d.h do exact comparisons in isNull and operator==. Would need #pragmas. *-g++*: QMAKE_CXXFLAGS += -Woverloaded-virtual -Wshadow -Wundef diff --git a/mkspecs/modules/README b/mkspecs/modules/README index 9ce22005d3..10c6da374b 100644 --- a/mkspecs/modules/README +++ b/mkspecs/modules/README @@ -1,3 +1,3 @@ Qt modules need to drop a qmake file here to become part of the current Qt configuration. The file format is documented in -http://wiki.qt.io/?title=Creating_a_new_module_or_tool_for_Qt#The_qt_.3Cmodule.3E.pri_files +http://wiki.qt.io/Creating_a_new_module_or_tool_for_Qt#The_qt_.3Cmodule.3E.pri_files diff --git a/src/widgets/doc/src/modelview.qdoc b/src/widgets/doc/src/modelview.qdoc index 31a24204fe..b95a3ebba5 100644 --- a/src/widgets/doc/src/modelview.qdoc +++ b/src/widgets/doc/src/modelview.qdoc @@ -576,7 +576,7 @@ problem. Qt Labs provides software called - \l{http://wiki.qt.io/?title=Model_Test}{ModelTest}, + \l{http://wiki.qt.io/Model_Test}{ModelTest}, which checks models while your programming is running. Every time the model is changed, ModelTest scans the model and reports errors with an assert. This is especially important for tree models, since their hierarchical