Remove support for Madde-based platforms.

With Nokia's decision to stop support for Harmattan applications
in their app store, the last remains of a use case have disappeared.

Change-Id: Ia036112de01c8c3a866da3529b4a941db11c7358
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

7 files changed, 10 insertions, 73 deletions

diff --git a/doc/src/overview/creator-advanced.qdoc b/doc/src/overview/creator-advanced.qdoc
index 0bc3ff39eb..0892f7bc86 100644
--- a/doc/src/overview/creator-advanced.qdoc
+++ b/doc/src/overview/creator-advanced.qdoc
@@ -24,7 +24,7 @@
 
 /*!
     \contentspage index.html
-    \previouspage creator-publishing-to-maemo-extras.html
+    \previouspage creator-publish-ovi.html
     \page creator-advanced.html
     \nextpage creator-os-supported-platforms.html
 
diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc
index 4a44816121..dd6944a7ba 100644
--- a/doc/src/overview/creator-deployment-overview.qdoc
+++ b/doc/src/overview/creator-deployment-overview.qdoc
@@ -47,14 +47,11 @@
             When you deploy the application to a BlackBerry 10 device, \QC generates a
             BAR package in the build directory and deploys it to the connected
             device.
-        \li \l{Deploying Applications to Linux-Based Devices}
+        \li \l{Deploying Applications to Embedded Linux Devices}
 
-            When you deploy the application to a Linux-based device, such
-            as embedded Linux, MeeGo 1.2 Harmattan, or Maemo 5/Fremantle, \QC
+            When you deploy the application to a generic Linux-based device, \QC
             copies the application files to the connected device. You
             can test and debug the application on the device.
-            You can create Debian installation packages for MeeGo Harmattan and
-            Maemo 5/Fremantle devices.
         \li  \l{Deploying Applications to QNX Devices}
 
             When you deploy the application to a BlackBerry, \QC  generates a
diff --git a/doc/src/overview/creator-deployment-ovi.qdoc b/doc/src/overview/creator-deployment-ovi.qdoc
index 158072f3fb..11507c11b0 100644
--- a/doc/src/overview/creator-deployment-ovi.qdoc
+++ b/doc/src/overview/creator-deployment-ovi.qdoc
@@ -26,43 +26,13 @@
     \contentspage index.html
     \previouspage creator-running-valgrind-remotely.html
     \page creator-publish-ovi.html
-    \nextpage creator-publish-ovi-maemo.html
+    \nextpage creator-advanced.html
 
     \title Publishing
 
     \image creator_publishing.png
 
-    You can publish applications to app stores, such as Nokia Store, and other
-    channels, such as Extras-devel for Maemo applications. Nokia Store is the
-    global content market of Nokia that consumers can access directly from Nokia
-    devices or through Web browsers.
-
-    The process and requirements to publish Qt applications to Nokia Store are
-    described in the
-    \l {http://www.developer.nokia.com/Community/Wiki/Guide_to_Publishing_Qt_Applications_to_the_Ovi_Store}
-    {Guide to Publishing Qt Applications to the Nokia Store} wiki.
-
-    \list
-
-        \li \l{Publishing Qt Content for MeeGo Harmattan Devices}
-
-            \QC generates installation packages that you can publish to
-            Nokia Store. However, you must make sure that the packages meet
-            the requirements of the Nokia Store.
-
-        \li \l{Publishing Qt Content for Maemo Devices}
-
-            \QC generates installation packages that you can publish to
-            Nokia Store. However, you must make sure that the packages meet
-            the requirements of the Nokia Store.
-
-        \li \l{Publishing Maemo Applications to Extras-devel}
-
-            You can use the \gui {Publish for Fremantle Extras-devel Free
-            Repository} wizard to create a source archive and, optionally,
-            upload it to a build server for compiling and packaging. The
-            package is then moved to the Extras-devel repository that
-            contains free Maemo applications.
+    You can publish applications to app stores.
 
     \endlist
 
diff --git a/doc/src/overview/creator-issues.qdoc b/doc/src/overview/creator-issues.qdoc
index 5b25d7476a..4e9cb49927 100644
--- a/doc/src/overview/creator-issues.qdoc
+++ b/doc/src/overview/creator-issues.qdoc
@@ -104,10 +104,6 @@
 
         \li  Creating new CMake projects with \QC is not supported.
 
-        \li  On Windows, you must create projects for Maemo 5 and Harmattan
-            device types on the same partition where you installed Qt 4 SDK, \QC, and
-            MADDE.
-
         \li  If error messages displayed in the \gui {Compile Output} pane contain
             paths where slashes are missing (for example, C:QtSDK),
             check your PATH variable. For more information, see
diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc
index dff710ee5f..f5089a3288 100644
--- a/doc/src/overview/creator-mobile-targets.qdoc
+++ b/doc/src/overview/creator-mobile-targets.qdoc
@@ -67,7 +67,7 @@
         \li \l{Connecting Embedded Linux Devices}
 
             If you have a tool chain for building applications for embedded
-            Linux devices (with no MADDE support) installed on the development
+            Linux devices installed on the development
             PC, you can add it and the device to \QC.
 
         \li \l{Connecting iOS Devices}
@@ -76,21 +76,6 @@
             \QC detects the tools and configured devices automatically and uses
             the tools to build, deploy, and run applications.
 
-        \li \l{Connecting Maemo Devices}
-
-            Maemo 5 (Fremantle) is a Linux-based software platform developed by
-            Nokia and delivered on the Nokia N900. Use a connectivity tool (Mad
-            Developer) to create the device-side end point for USB and WLAN
-            connections.
-
-       \li \l{Connecting MeeGo Harmattan Devices}
-
-            MeeGo Harmattan is a Linux-based software platform developed by
-            Nokia and preinstalled on Nokia N950 and Nokia N9. It enables
-            developers to create applications using the Qt framework.
-            Use the SDK Connectivity tool that is preinstalled on the device to
-            create the device-side end point for USB and WLAN connections.
-
         \li \l{Connecting QNX Devices}
 
             You can connect QNX devices to the development PC to deploy, run and
diff --git a/doc/src/overview/creator-target-platforms.qdocinc b/doc/src/overview/creator-target-platforms.qdocinc
index f6379d456c..62906e3ea3 100644
--- a/doc/src/overview/creator-target-platforms.qdocinc
+++ b/doc/src/overview/creator-target-platforms.qdocinc
@@ -14,10 +14,6 @@
 
         \li iOS
 
-        \li Maemo 5
-
-        \li MeeGo Harmattan
-
         \li QNX
 
         \li \QS
@@ -57,16 +53,6 @@
             \li Yes
             \li No
         \row
-            \li Maemo 5
-            \li Yes
-            \li Yes
-            \li Yes
-        \row
-            \li MeeGo Harmattan
-            \li Yes
-            \li Yes
-            \li Yes
-        \row
             \li QNX
             \li Yes
             \li Yes
@@ -82,3 +68,6 @@
     install \QSDK 1.2.1 or \QSDK 1.1.2 (that contains the Qt 4.6.3 for Symbian
     and Qt 4.7.3 for Symbian^3 and Symbian Anna targets) and use \QC 2.4.
 
+    \note Madde support has been removed from \QC 3.0. To develop for Maemo or Harmattan,
+    install \QSDK 1.2.1 or \QSDK 1.1.2 and use \QC 2.8.
+
diff --git a/doc/src/overview/creator-testing.qdoc b/doc/src/overview/creator-testing.qdoc
index f79b460c6f..0df70733d0 100644
--- a/doc/src/overview/creator-testing.qdoc
+++ b/doc/src/overview/creator-testing.qdoc
@@ -24,7 +24,7 @@
 
 /*!
     \contentspage index.html
-    \previouspage creator-maemo-emulator.html
+    \previouspage creator-build-process-customizing.html
     \page creator-testing.html
     \nextpage creator-debugging.html