From c83409eb534133af994b84a2b56ce5989c7252bd Mon Sep 17 00:00:00 2001
From: Venu <venugopal.shivashankar@digia.com>
Date: Thu, 6 Jun 2013 10:34:28 +0200
Subject: [PATCH] Doc: Cleaned up the supported platforms section
- Removed the compiler notes page as it was only pointing
to the supported platforms page.
- Added links to pages providing information about the
Mac OS X developer environment and platform notes.
Task-number: QTBUG-30173
Change-Id: Ic2ac5365055858240a77fe3235243e4e8a584c78
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
---
doc/src/platforms/compiler-notes.qdoc | 43 ----------------------
doc/src/platforms/platform-notes.qdoc | 7 ++++
doc/src/platforms/supported-platforms.qdoc | 1 +
3 files changed, 8 insertions(+), 43 deletions(-)
delete mode 100644 doc/src/platforms/compiler-notes.qdoc
diff --git a/doc/src/platforms/compiler-notes.qdoc b/doc/src/platforms/compiler-notes.qdoc
deleted file mode 100644
index 0e0ce894..00000000
--- a/doc/src/platforms/compiler-notes.qdoc
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \page compiler-notes.html
- \title Compiler Notes
- \brief Information about the C++ compilers and tools used to build Qt.
-
- This page used to contain information about the C++ compilers and tools
- used to build Qt on various platforms. This information is now maintained
- in the \l{Platform and Compiler Notes} for each platform.
-
- Please refer to the \l{Supported Platforms} page for information about the
- status of each platform.
-
- If you have anything to add to this list or any of the platform or
- compiler-specific pages, please submit it via the \l{Qt Bug Tracker}
- or through the \l{Public Qt Repository}.
-*/
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 13c02a67..850c9028 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -339,4 +339,11 @@
the \l{Qt D-Bus} module. However you can install \c dbus via Homebrew, Fink or
MacPorts; then when you build Qt it will be detected, and the Qt D-Bus module
will be built.
+
+ \section2 See Also
+
+ \list
+ \li \l{Qt for Mac OS X - Specific Issues}
+ \li \l{Qt is Mac OS X Native}
+ \endlist
*/
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index d3b9ca23..648457f8 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -216,6 +216,7 @@
- Software required to run Qt on Mac OS X.
\li \l{Installing Qt for Mac OS X}{Installing Qt for Mac OS X}
- Build Qt for Mac OS X development.
+ \li \l{Developing Qt Applications for Mac OS X} - Details about the developer evironment on Mac OS X
\li \l{Platform and Compiler Notes - Mac OS X}{Platform and Compiler Notes - Mac OS X}
- Platform specific notes.
\li \l{Developing Qt Applications for Mac OS X}
--
GitLab