diff options
author | Venu <venugopal.shivashankar@digia.com> | 2013-05-13 16:17:04 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-14 12:48:59 +0200 |
commit | 699ad224d09f72156651e21e108af311387ee43f (patch) | |
tree | b25c93793664036b63d1c887a374ffe81897b5a0 | |
parent | 4d2a67280b3dc44005c41fc558570bdbd54383a0 (diff) |
Doc: Replaced the HTTPS links with HTTP
The HTTPS links fail in Qt Assistant on Windows as the
qt installation package includes qt libraries that are
built without SSL support for legal reasons.
Task-number: QTBUG-31073
Change-Id: I617202d18372b6c454f65251875e5cd0d27a6803
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
-rw-r--r-- | doc/src/getting-started/installation.qdoc | 2 | ||||
-rw-r--r-- | doc/src/platforms/mac-differences.qdoc | 2 | ||||
-rw-r--r-- | doc/src/platforms/qtmac-as-native.qdoc | 2 | ||||
-rw-r--r-- | doc/src/portingguide.qdoc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index b3fde2311..d6a783499 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -666,7 +666,7 @@ in the \l{Qt for Windows CE Requirements} document. Qt requires Xcode to be installed on the system. You can get it from: - \l{https://developer.apple.com/xcode/} + \l{http://developer.apple.com/xcode/} The command line tools are also needed, they can be installed within XCode: diff --git a/doc/src/platforms/mac-differences.qdoc b/doc/src/platforms/mac-differences.qdoc index 3c45b96ae..31aa892e1 100644 --- a/doc/src/platforms/mac-differences.qdoc +++ b/doc/src/platforms/mac-differences.qdoc @@ -178,7 +178,7 @@ The items in the Application Menu will be merged correctly for your localized application, but they will not show up translated until you - \l{https://developer.apple.com/library/mac/#documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/10000123i-CH101-SW13} + \l{http://developer.apple.com/library/mac/#documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/10000123i-CH101-SW13} {add a localized resource folder} to the application bundle. The main thing you need to do is create a file called locversion.plist. Here is an example for Norwegian: diff --git a/doc/src/platforms/qtmac-as-native.qdoc b/doc/src/platforms/qtmac-as-native.qdoc index 144f9a913..ee79be3aa 100644 --- a/doc/src/platforms/qtmac-as-native.qdoc +++ b/doc/src/platforms/qtmac-as-native.qdoc @@ -62,7 +62,7 @@ \section1 Aqua This is a critical piece of Mac OS X (documentation can be found at - \l{https://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html#//apple_ref/doc/uid/20000957}). + \l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html#//apple_ref/doc/uid/20000957}). It is a huge topic, but the most important guidelines for GUI design are probably these: diff --git a/doc/src/portingguide.qdoc b/doc/src/portingguide.qdoc index 531c16d14..f2157556a 100644 --- a/doc/src/portingguide.qdoc +++ b/doc/src/portingguide.qdoc @@ -51,7 +51,7 @@ The following list summarizes the changes in Qt 5: \li Qt Widgets - These are now part of a separate module, \l{Qt Widgets}{QtWidgets}. They were part of \l{QtGui} earlier. \li Qt Quick - The older Qt Quick version (1.0) is now part of a separate - \l{https://qt-project.org/doc/qt-4.8/qtdeclarative.html}{Qt Declarative} + \l{http://qt-project.org/doc/qt-4.8/qtdeclarative.html}{Qt Declarative} add-on module for compatibility purposes. We recommend using the new Qt Quick (2.0) from now on to avoid binary breaks in the future. \li Qt3Support - This module is removed in Qt 5, so you must move away from |