diff options
| author | Christian Kandeler <[email protected]> | 2013-10-09 12:22:20 +0200 |
|---|---|---|
| committer | hjk <[email protected]> | 2013-10-15 10:27:28 +0200 |
| commit | 0ee5389017f3fa2b1407b00944369ac29389a0da (patch) | |
| tree | 1492e11d3699b18769885efa892d3fd509c00919 /doc/src | |
| parent | 520bd9ad536702339cda799ea43a489e7119859d (diff) | |
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 <[email protected]>
Diffstat (limited to 'doc/src')
31 files changed, 30 insertions, 1508 deletions
diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc index c19e17441c2..9b462b15304 100644 --- a/doc/src/debugger/creator-debugger-setup.qdoc +++ b/doc/src/debugger/creator-debugger-setup.qdoc @@ -100,10 +100,6 @@ \li Windows/MSVC \li Microsoft Visual C++ Compiler \li Debugging Tools for Windows/CDB - \row - \li Maemo, MeeGo - \li GCC - \li GDB \endtable \section2 Supported GDB Versions diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc index ee81898c39a..a111c988aa1 100644 --- a/doc/src/debugger/creator-debugger.qdoc +++ b/doc/src/debugger/creator-debugger.qdoc @@ -127,7 +127,7 @@ So if the current project is set up as a C++ application using the MinGW toolchain targeting desktop Windows, the GDB engine will be started in Start Internal mode. If the current project is a - QML application using C++ plugins targeting Meego + QML application using C++ plugins, a "mixed" QML/C++ engine will be started, with the C++ parts being handled by GDB and GDB server remote debugging. diff --git a/doc/src/ios/creator-ios-dev.qdoc b/doc/src/ios/creator-ios-dev.qdoc index 11d39a29673..4d8a93f1d91 100644 --- a/doc/src/ios/creator-ios-dev.qdoc +++ b/doc/src/ios/creator-ios-dev.qdoc @@ -21,7 +21,7 @@ \contentspage index.html \previouspage creator-developing-generic-linux.html \page creator-developing-ios.html - \nextpage creator-developing-maemo.html + \nextpage creator-developing-qnx.html \title Connecting iOS Devices diff --git a/doc/src/linux-mobile/creator-deployment-madde.qdoc b/doc/src/linux-mobile/creator-deployment-madde.qdoc index cabf454c554..4b211ed6516 100644 --- a/doc/src/linux-mobile/creator-deployment-madde.qdoc +++ b/doc/src/linux-mobile/creator-deployment-madde.qdoc @@ -28,10 +28,10 @@ \page creator-deployment-maemo.html \nextpage creator-deployment-qnx.html - \title Deploying Applications to Linux-Based Devices + \title Deploying Applications to Embedded Linux Devices - You can specify settings for deploying applications to Linux-based devices - (Embedded Linux, MeeGo Harmattan, and Maemo 5) in the project .pro file. + You can specify settings for deploying applications to generic Linux devices + in the project .pro file. You can view the settings in the \gui {Run Settings}. @@ -90,55 +90,4 @@ without SFTP support will crash when an SFTP upload is being attempted. This is not a bug in \QC. - \section1 Deploying on MeeGo Harmattan and Maemo 5 - - You can use desktop files to display icons on the home screen of the - device. To add desktop files to the project file, select \gui {Add Desktop - File}. To specify the icon file to display, select \gui {Add Launcher - Icon}. To remove desktop files and icons, delete the definitions from - the project file. - - If you develop your own libraries, \QC needs to be able to find them when - you compile projects depending on them. When you install MADDE, an instance - of the device file system, called sysroot, is installed to the development - PC. Libraries are copied to sysroot during the \gui {Install Debian package - to sysroot} step. - - \section1 Creating Debian Installation Packages - - When you run the application on the \gui{Maemo5} or \gui Harmattan device, - \QC generates a Debian installation package in the build directory by - default. You can deliver the installation package to users for installation - on devices that are of the same type and run the same firmware as the - connected device. - - \image qtcreator-maemo-deb-package.png "Create installation package" - - The name of the installation package is displayed in the \gui {Package name} - field in the \gui {Create Package} step. You can change the version number - in the \gui {Package version} field. - - You can specify information that users see on a delivery channel, such as - Nokia Store or Maemo.org. You can specify a short description of the - application, package name, and application icon. - - The Debian control file contains an application icon in encoded form. To add - the application icon to the file, select it in the \gui {Icon to be - displayed in Package Manager} field. For more information about icon files - and adding them manually, see - \l{ http://wiki.maemo.org/Packaging#Displaying_an_icon_in_the_Application_Manager_next_to_your_package} - {Displaying an icon in the Application Manager next to your package}. - - \note \QC automates this process for you. - - \QC provides templates for a set of files that must be included in Debian - packages. When you start using a \l{glossary-buildandrun-kit}{kit} with - \gui Maemo5 or \gui Harmattan device type - for a project, \QC asks whether packaging files are to be added to the project and - to version control. If you plan to edit the packaging files, add them to - version control. - - To edit the files, select a file in \gui {Adapt Debian file} and click - \gui Edit. The file opens in the text editor. - */ diff --git a/doc/src/linux-mobile/creator-madde-emulator.qdoc b/doc/src/linux-mobile/creator-madde-emulator.qdoc deleted file mode 100644 index b0372c65a56..00000000000 --- a/doc/src/linux-mobile/creator-madde-emulator.qdoc +++ /dev/null @@ -1,188 +0,0 @@ -/**************************************************************************** -** -** Copyright (c) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator -** -** -** GNU Free Documentation License -** -** 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. -** -** -****************************************************************************/ - -// ********************************************************************** -// NOTE: the sections are not ordered by their logical order to avoid -// reshuffling the file each time the index order changes (i.e., often). -// Run the fixnavi.pl script to adjust the links to the index order. -// ********************************************************************** - -/*! - \contentspage index.html - \previouspage creator-build-process-customizing.html - \page creator-maemo-emulator.html - \nextpage creator-testing.html - - \title Using Maemo or MeeGo Harmattan Emulator - - The Maemo 5 (Fremantle) and MeeGo Harmattan emulator are installed as part - of the Qt 4 SDK. After they are installed, you can start them from \QC. - - The Maemo 5 emulator emulates the Nokia N900 device environment. You can - test applications in conditions practically identical to running the - application on a Nokia N900 device with software update release 1.3 - (V20.2010.36-2). - - The MeeGo Harmattan emulator emulates the Nokia N9 device environment. - - With the emulators, you can test how your application reacts to hardware - controls, such as the power button, and to the touch screen. - - To test the application UI, user interaction with the application, and - functionality that uses the mobility APIs, use \QS, - instead. For more information, see the - \l{http://doc.qt.digia.com/qtsimulator/index.html}{\QS Manual}. - - The difference between \QS and the emulators is that when you - compile your application binary for \QS, it is compiled against a - host library. The binary run on the emulator is compiled for the actual - device, using the Maemo 5 or Harmattan tool chain. - - \section1 Starting the Emulator - - The \gui {Start MeeGo Emulator} button is visible if you have a project - open in \QC for which you have added a \l{glossary-buildandrun-kit}{kit} - with Maemo or MeeGo Harmattan device type. - It starts the Maemo or MeeGo Harmattan emulator, depending - on the selected kit. - - To start the emulator, click - \inlineimage qtcreator-maemo-emulator-button.png "Start MeeGo Emulator button" - . - - Test your application on the emulator as on a device. For a list of - keyboard shortcuts that you can use to emulate keys and functions, see - \l {Emulating Device Keys}. - - \section1 Rendering Graphics - - The emulators support OpenGL to improve graphics rendering. Hardware - acceleration produces better results than software rendering. By default, - \QC automatically detects, whether hardware acceleration is - supported on the development PC and tries to use it. However, sometimes - the results of the automatic detection are not reliable, and - hardware acceleration might be selected even if it is actually not - available on the development PC. This causes the emulator to crash. - - If the emulator crashes, you are asked whether you want to try software - rendering, instead. - - To specify the OpenGL mode, select \gui {Tools > Options > Linux Devices - > MeeGo Qemu Settings}. - - \section1 Emulating Device Keys - - The following table summarizes the keyboard shortcuts that you can use - to emulate device keys and functions. - - \table - \header - \li Device Key - \li Keyboard Shortcut - \row - \li \list - \li Alphabet keys - \li Comma (,) - \li Period (.) - \li Space - \li Arrow keys - \li Enter - \li Backspace - \endlist - \li Respective keys on the development PC keyboard. - \row - \li Shift - \li Left Shift key (Maemo 5) - - Shift (Harmattan) - \row - \li Ctrl - \li Left Ctrl key (Maemo 5) - - Ctrl (Harmattan) - \row - \li Mode - \li Left Alt key (Maemo 5) - - Alt (Harmattan) - \row - \li Power - \li Esc - \row - \li Keypad slider open and close - \li F1 - \row - \li Keypad lock (Maemo 5 only) - \li F2 - \row - \li Camera lens open and close (Maemo 5 only) - \li F3 - \row - \li Camera focus - \li F4 - \row - \li Camera take picture - \li F5 - - \note The actual camera functionality is not emulated. - \row - \li Stereo headphones connect and disconnect (Maemo 5 only) - \li F6 - \row - \li Volume down - \li F7 - \row - \li Volume up - \li F8 - \row - \li Accelerometer x axis, negative - \li 1 - \row - \li Accelerometer x axis, positive - \li 2 - \row - \li Accelerometer z axis, negative - \li 4 - \row - \li Accelerometer z axis, positive - \li 5 - \row - \li Accelerometer y axis, negative - \li 7 - \row - \li Accelerometer y axis, positive - \li 8 - - \endtable - - \note Each press of the accelerometer key turns the acceleration by 50 - percent. - - \section1 Closing the Emulator - - To close the emulator, click the X at the top right corner of the device - emulator view. The emulator interprets this as a press of the power button - and displays the text \e {Shutting down} in the emulator window title pane. - The emulator closes shortly after this. - - You can also select the \gui {Start MeeGo Emulator} button to close the - emulator. This is a faster way to close the emulator, because it does not - wait for the operating system running on the emulated machine to shut down, - but this also means that it is less safe. - -*/ diff --git a/doc/src/linux-mobile/creator-projects-running-madde.qdocinc b/doc/src/linux-mobile/creator-projects-running-madde.qdocinc deleted file mode 100644 index cb70db978f2..00000000000 --- a/doc/src/linux-mobile/creator-projects-running-madde.qdocinc +++ /dev/null @@ -1,41 +0,0 @@ - \section1 Running on Maemo or MeeGo Harmattan - - \list 1 - - \li Build and run the application for \l{Running on Qt Simulator} - {\QS}. - - \li Build and run the application for - \l{Using Maemo or MeeGo Harmattan Emulator} - {the Maemo or MeeGo Harmattan emulator}. - - \li Alternatively, you can build and run the application for a device: - - \list 1 - - \li Configure the device and specify a connection to it. For more - information, see \l{Connecting Maemo Devices} and - \l{Connecting MeeGo Harmattan Devices}. - - \li Connect the device to the development PC. - - \li Click the \gui Run button. - - \endlist - - \endlist - - \QC uses the compiler specified in the MADDE tool chain to build the - application. - - \QC generates an installation package, installs it on the device, and - executes the selected application. The application views are displayed on - the device. Command-line output is visible in the \QC - \gui {Application Output} view. - - Choose \gui {Projects > Maemo Run} to view the settings for deploying the - application to the connected device and creating the installation package. - For more information, see - \l{Specifying Run Settings for Linux-Based Devices}. - - Debugging also works transparently. diff --git a/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc b/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc index 9ba37324d1b..5eb597f7090 100644 --- a/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc +++ b/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc @@ -1,24 +1,15 @@ \section2 Specifying Run Settings for Linux-Based Devices - To run and debug an application on a Linux-based device (embedded Linux, - MeeGo Harmattan, or Maemo), you must create connections from the development + To run and debug an application on a Linux-based device, + you must create connections from the development host to the device and add the device configurations to \l{glossary-buildandrun-kit}{kits}. Click \gui {Manage Kits} to add devices to kits. For more information, see - \l{Configuring Connections to Maemo Devices}, - \l{Configuring Connections to Harmattan Devices}, and \l {Connecting Embedded Linux Devices}. When you run the application, \QC copies the files to the connected device. - For MeeGo Harmattan and Maemo device types, \QC also generates an - installation package in the build directory by default. You can deliver the - installation package to users for installation - on devices that are of the same type and run the same firmware as the - connected device. For more information, see - \l{Deploying Applications to Linux-Based Devices}. - - For generic embedded Linux devices, the run settings display the path to the + The run settings display the path to the executable file on the development host and on the device. To specify that another application launches your application, for example, enter the command in the \gui {Alternate executable on device} field and select the diff --git a/doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc b/doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc deleted file mode 100644 index 1b6c666b0ae..00000000000 --- a/doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** -** Copyright (c) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator -** -** -** GNU Free Documentation License -** -** 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. -** -** -****************************************************************************/ - -// ********************************************************************** -// NOTE: the sections are not ordered by their logical order to avoid -// reshuffling the file each time the index order changes (i.e., often). -// Run the fixnavi.pl script to adjust the links to the index order. -// ********************************************************************** - -/*! - \contentspage index.html - \previouspage creator-publish-ovi-meego.html - \page creator-publishing-to-maemo-extras.html - \nextpage creator-advanced.html - - \title Publishing Maemo Applications to Extras-devel - - Extras is the primary repository for Maemo applications where most - community software can be found. You can browse the applications available - in Extras at \l{http://maemo.org/downloads/Maemo5/}{Maemo Downloads}. - - You can publish both free and commercial applications to Extras. Free - applications must be open source and pass through a QA process. - Commercial applications are usually closed, binary only, and the publisher - is responsible for assuring their quality and security. - - You can upload free applications as Debian packages to - \l{http://wiki.maemo.org/Extras-devel}{Extras-devel} at Maemo.org to share - new updates to your application and to start the community QA process. - You need a \l{http://garage.maemo.org/}{Garage} account for the uploads, - but the package itself does not need to be hosted in the Garage. - - 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. From there on, you must follow the standard - Maemo processes to get the application published to Extras. - - The wizard checks that the package contains all the information that is - required to publish applications on Extras: package description and - Package Manager icon. For more information about entering this information, - see \l{Creating Debian Installation Packages}. - - To use the publishing wizard: - - \list 1 - - \li Select the \l{glossary-buildandrun-kit}{kit} with \gui {Maemo5} device type - for your project. - - \li Choose \gui {Build > Publish Project}. - - \li Select \gui {Publish for Fremantle Extras-devel Free Repository}, - and then select \gui {Start Wizard}. - - \li Select the Qt version and device type to build against and click - \gui Next. - - To create a source archive without uploading it to the build - server, select the \gui {Only create source package, do not upload} - check box. - - \li In the \gui {Garage account name} field, enter your login name, or - select \gui {Get an account} to create a new account. - - \image qtcreator-publish-maemo-extras.png "Upload Settings dialog" - - You can also select \gui {Request upload rights} to use the Maemo - Extras Assistant to validate your Garage account. - - \li Select \gui Commit to select the files to include in the source - package. - - \li Select \gui OK to build the source package, and optionally, publish - the application. - - \endlist - -*/ diff --git a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc deleted file mode 100644 index 4f0e2e48d09..00000000000 --- a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (c) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator -** -** -** GNU Free Documentation License -** -** 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. -** -** -****************************************************************************/ - -// ********************************************************************** -// NOTE: the sections are not ordered by their logical order to avoid -// reshuffling the file each time the index order changes (i.e., often). -// Run the fixnavi.pl script to adjust the links to the index order. -// ********************************************************************** - -/*! - \contentspage index.html - \previouspage creator-publish-ovi.html - \page creator-publish-ovi-maemo.html - \nextpage creator-publish-ovi-meego.html - - \title Publishing Qt Content for Maemo Devices - - The applications that you publish on Nokia Store, must meet the testing - criteria listed in - \l{http://www.developer.nokia.com/info/sw.nokia.com/id/9cd1eb18-821b-4228-a0a3-36b049c5d608/Maemo_5_Application_OVI_Store_Entry_Requirements.pdf.html} - {Maemo 5 Applications: Nokia Store Entry Requirements}. - - Make sure that your application passes the following most commonly - failed test cases: - - \list - - \li Package filename must include the application name and version - number using three digits. For example: myapplication_1_0_1.deb - - \li Application files must be installed to the opt folder on the ext3 - partition. - - \li Debian packages must be given the category user/hidden. - - \li Application cannot crash or hang during use. - - \li The application must handle different memory situations correctly. - - \endlist - - You set the application name and installation folder in the - \gui {Run Settings} for the project. For more information, see - \l{Deploying Applications to Linux-Based Devices}. \QC - specifies the correct category settings by default when it creates the - Debian directory and the necessary files. - - You can test the application on \QS and Maemo emulator to make - sure that it does not crash or hang and to check how it handles different - memory situations. Before you submit the application to Nokia Publish, you - must also fully test it on a Maemo device. - -*/ diff --git a/doc/src/linux-mobile/creator-publish-ovi-meego.qdoc b/doc/src/linux-mobile/creator-publish-ovi-meego.qdoc deleted file mode 100644 index 24ed4c489f0..00000000000 --- a/doc/src/linux-mobile/creator-publish-ovi-meego.qdoc +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (c) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator -** -** -** GNU Free Documentation License -** -** 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. -** -** -****************************************************************************/ - -// ********************************************************************** -// NOTE: the sections are not ordered by their logical order to avoid -// reshuffling the file each time the index order changes (i.e., often). -// Run the fixnavi.pl script to adjust the links to the index order. -// ********************************************************************** - -/*! - \contentspage index.html - \previouspage creator-publish-ovi-maemo.html - \page creator-publish-ovi-meego.html - \nextpage creator-publishing-to-maemo-extras.html - - \title Publishing Qt Content for MeeGo Harmattan Devices - - The applications that you publish to Nokia Store, must meet the - \l{http://www.developer.nokia.com/info/sw.nokia.com/id/44affcd1-ceba-4aca-8b65-670ce2cbbd1e/MeeGo_1_2_Harmattan_Applications_Ovi_Store_Entry_Requirements.html} - {MeeGo 1.2 Harmattan Applications: Nokia Store Entry Requirements}. - -*/ diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index 4c3559cbb4b..202708e26f3 100644 --- a/doc/src/linux-mobile/linuxdev.qdoc +++ b/doc/src/linux-mobile/linuxdev.qdoc @@ -29,7 +29,7 @@ debug, and analyze applications on them from \QC. If you have a tool chain for building applications for embedded Linux - devices (with no MADDE support) installed on the development PC, you can add + devices installed on the development PC, you can add it to \QC. You can then select a \l{glossary-buildandrun-kit}{kit} with \gui {Embedded Linux} device type to build and run applications on embedded Linux devices. @@ -115,9 +115,10 @@ When you run the project, \QC deploys the application as specified by the deploy steps. By default, \QC copies the application files to the device. - For more information, see \l{Deploying Applications to Linux-Based Devices}. + For more information, see \l{Deploying Applications to Embedded Linux Devices}. \endlist + \include linux-mobile/linuxdev-keys.qdocinc + \include linux-mobile/linuxdev-processes.qdocinc */ - diff --git a/doc/src/linux-mobile/madde-emulator-overview.qdocinc b/doc/src/linux-mobile/madde-emulator-overview.qdocinc deleted file mode 100644 index 570446803b1..00000000000 --- a/doc/src/linux-mobile/madde-emulator-overview.qdocinc +++ /dev/null @@ -1,16 +0,0 @@ - \section2 Maemo and MeeGo Harmattan Emulator - - The Maemo 5 (Fremantle) and MeeGo Harmattan emulator are installed as part - of the \QSDK. After they are installed, you can start them from \QC. - - The Maemo 5 emulator emulates the Nokia N900 device environment. You can - test applications in conditions practically identical to running the - application on a Nokia N900 device with the software update release 1.3 - (V20.2010.36-2). - - The Harmattan emulator emulates the Nokia N9 device environment. - - With the emulators, you can test how your application reacts to hardware - controls, such as the power button, and to the touch screen. Usually, - it is faster to test on a real device connected to the development PC than - to use the emulators. diff --git a/doc/src/linux-mobile/maemodev.qdoc b/doc/src/linux-mobile/maemodev.qdoc deleted file mode 100644 index 9c4878c0fd6..00000000000 --- a/doc/src/linux-mobile/maemodev.qdoc +++ /dev/null @@ -1,416 +0,0 @@ -/**************************************************************************** -** -** Copyright (c) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator -** -** -** GNU Free Documentation License -** -** 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. -** -** -****************************************************************************/ - - /*! - - \contentspage index.html - \previouspage creator-developing-ios.html - \page creator-developing-maemo.html - \nextpage creator-developing-meego.html - - \title Connecting Maemo Devices - - Maemo 5 (Fremantle) is a Linux-based software platform developed by Nokia - for mobile devices. It allows developers to create - applications using the Qt framework. - You can install the whole tool chain that you need to create, build, debug, - run, and deploy Maemo 5 applications as a part of the custom installation - in the Qt 4 SDK online installer. - - \note In \QC 2.7, and later, the Madde plugin that you need for Maemo - development is disabled by default. To enable it, select \gui Help > - \gui {About Plugins} > \gui {Device Support} > \gui Madde and restart \QC. - - For more - information about the Maemo 5 platform, see - \l{http://maemo.org/intro/platform/}{Software Platform} on the Maemo web site. - - For more information about developing applications for the Maemo 5 - platform, select \gui {Help > Index} and look for \gui {Platform Notes}, - or see - \l{http://doc.qt.digia.com/qt-maemo/platform-notes-maemo5.html}{Platform Notes - Maemo 5}. - - \section1 Hardware and Software Requirements for Maemo Devices - - To build and run Qt applications for Maemo 5, you need the following: - \list - - \li Maemo 5 device: Nokia N900 with software update release 1.3 - (V20.2010.36-2) or later installed. - \li MADDE cross-platform Maemo development - tool (installed as part of the Qt 4 SDK). - - \li Nokia USB drivers. - - Only needed if you develop on Windows and if you use a USB connection - to run applications on the device. The drivers are - installed as part of the Qt 4 SDK. You can also download them from - \l{http://garage.maemo.org/frs/?group_id=801&release_id=2655}{PC Connectivity} - on the Maemo web site. Download and install the latest - PC_Connectivity_<version>.exe (at the time of writing, - PC_Connectivity_0.9.4.exe). - - \endlist - - \note The only supported build system for Maemo 5 in \QC is qmake. - - \section1 Setting Up Connectivity in Maemo Devices - - You can connect your device to your development PC using either a USB or - WLAN connection. - - For the device, you need to use a connectivity tool (Mad Developer) to - create the - device-side end point for USB and WLAN connections. It provides no - diagnostics functions but is essential for creating connections between the - device and your development PC. - - To use a WLAN connection, you must activate WLAN on the device and connect - it to the same WLAN as the development PC. The network address is displayed - in the connectivity tool. - - To use a USB connection, you need to set up the device as a network device - on the development PC. - - \note If you plan to connect your development PC to the device only over - WLAN, you can - ignore the USB-specific parts in the following sections. - - \section2 Installing and Configuring Mad Developer - - Install Mad Developer on a Nokia N900 device and configure - a connection between the development PC and a device. - - \note The following instructions describe Mad Developer 2.1. The process and - text labels might differ on other Mad Developer versions. - - To install and configure Mad Developer: - - \list 1 - \li On the Nokia N900, select \gui{App Manager > Download} > \gui{Development} > \gui{mad-developer} - to install the Mad Developer software package. - \li Click \gui {Mad Developer} to start the Mad Developer application. - - \li To use a WLAN connection, activate WLAN on the device and connect - to the same network as the development PC. You can see the network - address in the \gui wlan0 field. - - \li To use a USB connection: - - \list a - - \li If you are using Microsoft Windows as development host, you must - change the driver loaded for instantiating the connection. - In the Mad Developer, select \gui{Manage USB} and select \gui{Load g_ether}. - - \li To set up the USB settings, click \gui Edit on the \gui usb0 row and - confirm by clicking \gui Configure. - - \note By default, you do not need to make changes. The \gui usb0 row - displays the IP address 192.168.2.15. - - \endlist - - \li Select \gui{Developer Password} to generate a password for a freshly - created user called \b developer. The password stays valid for as long - as the password generation dialog is open. You enter the password when - you configure the connection in \QC. - - \image qtcreator-mad-developer-screenshot.png - \endlist - - \section1 Installing Qt Mobility Libraries - - To develop applications for the Nokia N900 devices that use the Qt Mobility - APIs, you must install the - Qt Mobility Libraries on the devices. The libraries are not available in the - device package - manager, and therefore, you must install them from the command line as the - root user: - - \list 1 - - \li On the device, in \gui Programs, select \c {X Terminal} to open a - terminal window. - - \li To install Qt Mobility libraries, enter the following command: - \c{/usr/lib/mad-developer/devrootsh apt-get install libqtm-*} - - \li To confirm the installation, enter: \c Y - - \li Close the terminal. - - \endlist - - \section1 Setting Up USB Connections to Maemo Devices - - Use the network configuration tools on your platform to specify the USB - connection to the device on the development PC. You do not need to do this - if you use a WLAN connection. - - \section2 Linux - - The device uses the IP address 192.168.2.15 with the subnet 255.255.255.0 - for its USB connection by default, so you can create the network interface - with a different address inside the same subnet too. - - \note If you have changed the IP address of the device in the connectivity - tool, you need to reflect those changes in your development PC USB - network settings. - - Run the following command in a shell as root user: - \c{ifconfig usb0 192.168.2.14 up} - - \section2 Windows - - When you connect the device to your Windows PC, Windows tries to install a - driver for the Linux USB Ethernet connection. In the - \gui{Found New Hardware Wizard}, select \gui{No, not this time} in the - first dialog and \gui{Install the software automatically} in the second - dialog. - - To specify a network connection: - - \list 1 - - \li Open the Network Connections window. - - \li Select the Linux USB Ethernet - connection that is displayed as a new Local Area Connection. - - \li Edit the \gui {Internet Protocol Version 4 (TCP/IPv4)} properties - to specify the IP address for the connection. - In the \gui {Use the following IP address} field, enter the following values: - \list - \li \gui {IP Address}: \b {192.168.2.14} - \li \gui SubnetMask: \b {255.255.255.0} - \li \gui {Default gateway}: leave this field empty - \endlist - - \endlist - - Depending on - your version of Microsoft Windows you may have to unplug and re-plug the - device to reload the driver with its configuration accordingly. - - \section1 Configuring Connections to Maemo Devices - - To be able to run and debug applications on the Maemo - emulator and devices, you must set up connections to the emulator and - devices in the \QC build and run settings. If you install Qt 4 SDK, the - connection to the emulator is configured automatically and you - only need to configure a connection to the device. - - You use a wizard to create the connections. You can edit the settings later - in \gui Tools > \gui Options > \gui Devices. - - \image qtcreator-maemo-device-configurations.png "Devices dialog" - - By default, you create the connection as the \e developer user. This - protects real user data on the device from getting corrupted during - testing. If you write applications that use Qt Mobility APIs, you might want - to test them with real user data. To create a connection as a user, specify - the \gui Username and \gui Password in \QC. For more information, see - \l{Testing with User Data on Maemo Devices}. - - You can protect the connections between \QC and - a device by using either a password or an SSH key. If you use a password, you - must generate it in the connectivity tool and enter it in \QC every time - you start the connectivity tool. - - If you do not have an SSH key, you can create it in \QC. - Encrypted keys are not supported. For more - information, see - \l{Generating SSH Keys}. - - You can view processes running on devices and kill them. For more - information, see - \l{Managing Device Processes}. - - - To configure connections between \QC and a - device: - - \list 1 - - \li To deploy applications and run them remotely on devices, - specify parameters for accessing devices: - - \list a - - \li Connect your device to the development PC via a USB cable or - a WLAN. For a USB connection, you are prompted to select the mode - to use. Choose \gui{PC suite mode}. - - \note If you experience connection problems due to a USB port issue, - switch to a different port or use WLAN to connect to the device. - - \li Select \gui Tools > \gui Options > \gui Devices > \gui Add. - - \li Select \gui {Maemo5/Fremantle} > \gui {Start Wizard}. - - \image qtcreator-dev-conf-maemo.png "Maemo device" - - \li In the \gui {The name to identify this configuration} field, - enter a name for the connection. - - \li In the \gui {The kind of device} field, select - \gui {Hardware device}. - - \li In the \gui {The device's host name or IP address} field, enter - the IP address from the connectivity tool on the device. - - \li In the \gui {The SSH server port} field, enter the port number to - use for SSH connections. - - \li Click \gui Next. - - \li Follow the instructions of the wizard to create the connection. - - \endlist - - \li To test applications on the emulator (QEMU) separately, you must - create a connection to it from the development PC. If you installed - Qt 4 SDK, the connection is created automatically and you can omit this - step. - - \list a - - \li In \QC, select \gui Tools > \gui Options > \gui Devices > - \gui Add to add a new configuration. - - \li In the \gui {The kind of device} field, select - \gui Emulator. - - \li Click \gui Next. - - \li Follow the instructions of the wizard to create and test the - connection. - - \endlist - - \li Select \gui Tools > \gui Options > \gui {Build & Run} > - \gui Kits > \gui Add to add a kit for building for the device: - - \list a - - \li In the \gui {Device type} field, select - \gui {Maemo5/Fremantle}. - - \li In the \gui Device field, select the device that you added - above. - - \li In the \gui Sysroot field, specify the path to the sysroot. - By default, the Qt 4 SDK installer places sysroot in the - following folder: - \c{QtSDK\Maemo\4.6.2\sysroots\fremantle-arm-sysroot-20.2010.36-2-slim}. - - \li In the \gui {Compiler type} field, select GCC. - - \li In the \gui Compiler field, specify the path to the GCC - compiler. By default, the Qt 4 SDK installer places the - compiler in the following folder: - \c{QtSDK\Maemo\4.6.2\targets\fremantle-pr13\bin\}. - - \li In the \gui Debugger field, specify the path to GDB. By - default, the Qt 4 SDK installer places the debugger - in the following folder: - \c{QtSDK\Maemo\4.6.2\targets\fremantle-pr13\bin\}. - - \li In the \gui {Qt version} field, choose the MADDE Qt version - for Maemo5/Fremantle. By default, the Qt 4 SDK installer - places qmake in the following folder: - \c{QtSDK\Maemo\4.6.2\targets\fremantle-pr13\bin\}. - - \endlist - - You can leave the \gui {Qt mkspec} field empty. - - \li Open a project for an application you want to develop for your - device. - - \li Select \gui Projects > \gui {Build & Run} > \gui {Add Kit} to - add the kit that you specified above. - - \li Select \gui Run to specify run settings for the project. - - \li The mobile application wizard automatically sets the folder - where the file is installed on the device in the \gui {Remote - Directory} field. For example, \c {/opt/usr/bin}. If the text - \gui {<no target path set>} is displayed, click it to specify a - folder. - - \endlist - - \section2 Testing with User Data on Maemo Devices - - To run your application as the default user, you must first assign a - password for the user account and then create the connection to the device - as the user: - - \list 1 - - \li On the device, in \gui Programs, select \c {X Terminal} to open a - terminal window. - - \li To specify the password, enter the following command: - \c{/usr/lib/mad-developer/devrootsh passwd user} - - \li In \QC, select \gui Tools > \gui Options > \gui Devices. - - \li Specify the username \c user and the password in the device - configuration. - - \endlist - - \section1 Troubleshooting Connections to Maemo Devices - - The addresses used in this example might be reserved by some other application - in your network. If you cannot establish a connection, try the following optional - configurations: - - \table - - \header - \li IP Address and Network on Device - \li USB Network on Development PC - \li Host Name in \QC Build Settings - - \row - \li 172.30.7.15 255.255.255.0 - \li 172.30.7.14 255.255.255.0 - \li 172.30.7.15 - - \row - \li 10.133.133.15 - \li 10.133.133.14 - \li 10.133.133.15 - - \row - \li 192.168.133.15 - \li 192.168.133.14 - \li 192.168.133.15 - - \note You cannot use the value localhost for connections to a device. - - \endtable - - \note VPN connections might block the device connection. - -*/ - diff --git a/doc/src/linux-mobile/meegodev.qdoc b/doc/src/linux-mobile/meegodev.qdoc deleted file mode 100644 index 863d986eca9..00000000000 --- a/doc/src/linux-mobile/meegodev.qdoc +++ /dev/null @@ -1,444 +0,0 @@ -/**************************************************************************** -** -** Copyright (c) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator -** -** -** GNU Free Documentation License -** -** 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. -** -** -****************************************************************************/ - - /*! - - \contentspage index.html - \previouspage creator-developing-maemo.html - \page creator-developing-meego.html - \nextpage creator-developing-qnx.html - - \title Connecting MeeGo Harmattan Devices - - MeeGo Harmattan is a Linux-based software platform developed by Nokia for - mobile devices. It allows developers to create applications using the Qt - framework. You can install and configure the whole tool chain that you need - to create, build, debug, run, and deploy Harmattan applications as part of - the Qt 4 SDK. - - \note In \QC 2.7, and later, the Madde plugin that you need for MeeGo - development is disabled by default. To enable it, select \gui Help > - \gui {About Plugins} > \gui {Device Support} > \gui Madde and restart \QC. - - For more information about the Harmattan platform, see - \l{http://library.developer.nokia.com/topic/MeeGo_1.2_Harmattan_API/html/guide/html/Developer_Library_Harmattan_overview_5dcf.html} - {Harmattan Overview} in the MeeGo 1.2 Harmattan Developer Library. - - \note Qt 4 SDK does not contain the tool chains for building applications for - other MeeGo devices than MeeGo Harmattan. You can try to run applications - from \QC on other MeeGo devices, but it has not been extensively - tested, and the instructions might not always apply. - - \note The only supported build system for Harmattan in \QC is qmake. - - \section1 Setting Up Connectivity in Harmattan Devices - - To build and run Qt applications for Harmattan, you need a Harmattan device: - Nokia N950 or Nokia N9. - - You can connect your device to your development PC using either a USB or - WLAN connection. - - For the device, you need to use the SDK Connectivity tool that is - preinstalled on the device to create the device-side end point for USB and - WLAN connections. It provides no diagnostics functions but is essential for - creating connections between the device and your development PC. - - To use a WLAN connection, you must activate WLAN on the device and connect - it to the same WLAN as the development PC. The network address is displayed - in the connectivity tool. - - To use a USB connection, you might need to set up the device as a network - device on the development PC. However, on Linux, Mac OS X, and Windows 7, - the USB interface is usually automatically configured. - - \note If you plan to connect your development PC to the device only over - WLAN, you can ignore the USB-specific parts in the following sections. - - \section2 Starting SDK Connectivity - - SDK Connectivity application is preinstalled in Harmattan devices and - available in developer mode. - - To start SDK Connectivity: - - \list - - \li On the device, select \gui {Settings > Security > Developer - mode} to turn on developer mode. - - \li Select \gui {Applications > SDK Connectivity} to start the SDK - Connectivity application. - - \li Select \gui {Select Connection} and then select the type of the - connection to create: \gui WLAN or \gui USB. - - \li For a USB connection, select the operating system of the - development PC in \gui {Select Module}. - - \endlist - - \gui {Connectivity Details} displays the IP address and developer password. - The address 192.168.2.15 is used by default. You must enter the password in - \QC. For more information, see - \l{Configuring Connections to Harmattan Devices}. - - \section1 Setting Up Network Connectivity on Development PC - - Use the network configuration tools on your platform to specify the - connection to the device on the development PC. You need to do this - only if you use a USB connection. - - The device uses the IP address 192.168.2.15 with the subnet 255.255.255.0 - for its USB connection by default, so you can create the network interface - with a different address inside the same subnet too. - - \note If you have changed the IP address of the device in the connectivity - tool, you need to reflect those changes in your development PC USB - network settings. - - \section2 Linux - - The USB interface is automatically configured. If, for some reason, that is - not the case, run the following command in a shell as root user to create a - new network interface: - - \c{ifconfig usb0 192.168.2.14 up} - - \section2 Mac OS X - - The USB interface is automatically configured. If, for some reason, that is - not the case, create a new network interface manually: - - \list - - \li Open the network settings. - - \li Click the + button on the network settings panel. - - \li When the interface is available, select \gui {Configure IPv4 > Using - DHCP with manual address}. - - \li Enter the address 192.168.2.14 into the IP address field. - - \li Click \gui Apply. - - The network connection between your device and workstation is now - configured. - - \endlist - - \section2 Windows 7 - - When you connect your device to your Windows 7 computer, Windows installs a - driver for the Linux USB Ethernet connection automatically. If the - installation does not start, unplug the USB cable and try another USB port - on your computer. - - \note Driver installation takes some time. - - The USB interface is automatically configured. If, for some reason, that is - not the case, create a new network interface manually: - - \list 1 - - \li Open the \gui {Network and Sharing Center} and select \gui {Change - adapter settings}. - - The Linux USB Ethernet connection you just installed is displayed - as a new \gui {Local Area Connection Linux USB Ethernet/RNDIS - gadget}. - - \note If you cannot see \gui {Linux USB Ethernet/RNDIS gadget}, try - to unplug and replug the USB cable. - - \li Right-click \gui {Linux USB Ethernet/RNDIS gadget} and select - \gui Properties. - - \li Edit the \gui {Internet Protocol Version 4 (TCP/IPv4)} properties - to specify the IP address for the connection. In the \gui {Use the - following IP address} field, enter the following values: - - \list - - \li \gui {IP Address}: \b {192.168.2.14} - \li \gui SubnetMask: \b {255.255.255.0} - \li \gui {Default gateway}: leave this field empty - - \endlist - - \endlist - - \section2 Windows XP - - If you develop on Windows XP and use a USB connection to run applications on - the device, you need the Nokia USB drivers that are installed as part of the - Qt 4 SDK. - - When you connect the device to your Windows PC, Windows tries to install a - driver for the Linux USB Ethernet connection. In the - \gui{Found New Hardware Wizard}, select \gui{No, not this time} in the - first dialog and \gui{Install the software automatically} in the second - dialog. - - To specify a network connection: - - \list 1 - - \li Open the Network Connections window. - - \li Select the Linux USB Ethernet connection that is displayed as a new - Local Area Connection. - - \li Edit the \gui {Internet Protocol Version 4 (TCP/IPv4)} properties - to specify the IP address for the connection. In the \gui {Use the - following IP address} field, enter the following values: - - \list - - \li \gui {IP Address}: \b {192.168.2.14} - \li \gui SubnetMask: \b {255.255.255.0} - \li \gui {Default gateway}: leave this field empty - - \endlist - - \endlist - - Depending on your version of Microsoft Windows you may have to unplug and - re-plug the device to reload the driver with its configuration accordingly. - - \section1 Configuring Connections to Harmattan Devices - - To be able to run and debug applications on the emulator and devices, you - must set up connections to the emulator and devices in the \QC build - and run settings. If you install Qt 4 SDK, the connection to the emulator is - configured automatically and you only need to configure a connection to the - device. - - You use a wizard to create the connections. You can edit the settings later - in \gui Tools > \gui Options > \gui Devices. - - \image qtcreator-meego-device-configurations.png "Devices dialog" - - By default, you create the connection as the \e developer user. This - protects real user data on the device from getting corrupted during testing. - If you write applications that use Qt Mobility APIs, you might want to test - them with real user data. To create a connection as a user, specify the - \gui Username and \gui Password in \QC. For more information, see - \l{Testing with User Data on MeeGo Devices}. - - You can protect the connections between \QC and a device by using - either a password or an SSH key. If you use a password, you must generate it - in the connectivity tool and enter it in \QC every time you start the - connectivity tool. - - If you do not have an SSH key, you can create it in \QC. Encrypted - keys are not supported. For more information, see - \l{Generating SSH Keys}. - - You can view processes running on devices and kill them. For more - information, see - \l{Managing Device Processes}. - - To configure connections between \QC and a device: - - \list 1 - - \li To deploy applications and run them remotely on devices, - specify parameters for accessing devices: - - \list a - - \li Connect your device to the development PC via a USB cable or - a WLAN. For a USB connection, you are prompted to select the - mode to use. Choose \gui{PC suite mode}. - - \note If you experience connection problems due to a USB - port issue, switch to a different port or use WLAN to - connect to the device. - - \li Select \gui Tools > \gui Options > \gui Devices > \gui Add. - - \li Select \gui {MeeGo 1.2 Harmattan} > \gui {Start Wizard} to - add a new configuration for a device. - - \image qtcreator-screenshot-devconf.png - - \li In the \gui {The name to identify this configuration} field, - enter a name for the connection. - - \li In the \gui {The kind of device} field, select - \gui {Hardware device}. - - \li In the \gui {The device's host name or IP address} field, - enter the IP address from the connectivity tool on the - device. - - \li In the \gui {The SSH server port} field, enter the port - number to use for SSH connections. - - \li Click \gui Next. - - \li Follow the instructions of the wizard to create the - configuration. - - \endlist - - \li To test applications on the emulator (QEMU), you must - create a connection to it from the development PC. If you installed - Qt 4 SDK, the connection is created automatically and you can omit this - step. - - \list a - - \li In \QC, select \gui Tools > \gui Options > \gui Devices > - \gui Add to add a new configuration. - - \li Select \gui {MeeGo 1.2 Harmattan} > \gui {Start Wizard}. - - \li In the \gui {The name to identify this configuration} field, - enter a name for the connection. - - \li In the \gui {The kind of device} field, select - \gui Emulator. - - \li Click \gui Next. - - \li Follow the instructions of the wizard to create the - connection. - - SDK Connectivity is not needed for emulator connections, and - therefore, you do not need to authenticate the emulator - connection. - - \endlist - - \li Select \gui Tools > \gui Options > \gui {Build & Run} > - \gui Kits > \gui Add to add a kit for building for the device: - - \list a - - \li In the \gui {Device type} field, select - \gui {MeeGo 1.2 Harmattan}. - - \li In the \gui Device field, select the device that you added - above. - - \li In the \gui Sysroot field, specify the path to the sysroot. - By default, the Qt 4 SDK installer places sysroot in the - following folder: - \c{QtSDK\Madde\bin\sysroots\harmattan_sysroot_10.2011.34-1_slim}. - - \li In the \gui {Compiler type} field, select GCC. - - \li In the \gui Compiler field, specify the path to the GCC - compiler. By default, the Qt 4 SDK installer places the - compiler in the following folder: - \c{QtSDK\Madde\targets\harmattan_10.2011.34-1_rt1.2\bin\}. - - \li In the \gui Debugger field, specify the path to GDB. By - default, the Qt 4 SDK installer places the debugger - in the following folder: - \c{QtSDK\Madde\targets\harmattan_10.2011.34-1_rt1.2\bin\}. - - \li In the \gui {Qt version} field, choose the MADDE Qt version - for MeeGo 1.2 Harmattan. By default, the Qt 4 SDK installer - places qmake in the following folder: - \c{QtSDK\Madde\targets\harmattan_10.2011.34-1_rt1.2\bin\}. - - \endlist - - You can leave the \gui {Qt mkspec} field empty. - - \li Open a project for an application you want to develop - for your device. - - \li Select \gui Projects > \gui {Build & Run} > \gui {Add Kit} to - add the kit that you specified above. - - \li Select \gui Run to specify run settings for the project. - - \li The Qt Quick project wizards automatically set the folder - where the file is installed on the device in the \gui {Remote - Directory} field. For example, \c {/opt/usr/bin}. If the text - \gui {<no target path set>} is displayed, click it to specify a - folder. - - \endlist - - \section2 Testing with User Data on MeeGo Devices - - To run your application as the default user, you must first assign a - password for the user account and then create the connection to the device - as the user: - - \list 1 - - \li On the device, select \gui Terminal to open a - terminal window. - - \li To specify the password, enter the following command: - \c{/usr/lib/mad-developer/devrootsh passwd user} - - \li In \QC, select \gui Tools > \gui Options > \gui Devices. - - \li Specify the username \c user and the password in the device - configuration. - - \endlist - - \include linux-mobile/linuxdev-keys.qdocinc - \include linux-mobile/linuxdev-processes.qdocinc - - \section1 Troubleshooting Harmattan Connections - - The addresses used in this example might be reserved by some other - application in your network. If you cannot establish a connection, try the - following optional configurations: - - \table - - \header - \li IP Address and Network on Device - \li USB Network on Development PC - \li Host Name in \QC Build Settings - - \row - \li 172.30.7.15 255.255.255.0 - \li 172.30.7.14 255.255.255.0 - \li 172.30.7.15 - - \row - \li 10.133.133.15 - \li 10.133.133.14 - \li 10.133.133.15 - - \row - \li 192.168.133.15 - \li 192.168.133.14 - \li 192.168.133.15 - - \note You cannot use the value localhost for connections to a - device. - - \endtable - - \note VPN connections might block the device connection. - -*/ - diff --git a/doc/src/overview/creator-advanced.qdoc b/doc/src/overview/creator-advanced.qdoc index 0bc3ff39eb8..0892f7bc86e 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 4a44816121a..dd6944a7ba0 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 158072f3fbd..11507c11b0f 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 5b25d7476ac..4e9cb499274 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 dff710ee5ff..f5089a32883 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 f6379d456c9..62906e3ea3d 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 f79b460c6f0..0df70733d08 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 diff --git a/doc/src/projects/creator-projects-building-running.qdoc b/doc/src/projects/creator-projects-building-running.qdoc index 05abf5c86df..97411f2df82 100644 --- a/doc/src/projects/creator-projects-building-running.qdoc +++ b/doc/src/projects/creator-projects-building-running.qdoc @@ -97,17 +97,6 @@ with \gui Desktop device type and the Qt Simulator Qt version for building and running your projects. - \li \l{Using Maemo or MeeGo Harmattan Emulator} - - You cannot use \QS to test applications that use device - specific libraries, such as native device APIs. To test such - applications, use the device emulators or real devices. With the - emulators, you can test how your application reacts to hardware - controls, such as the power button, and to the touch screen. - Usually, it is faster to test on a real device connected to the - development PC than to use the emulators. The emulator is installed - as part of the Qt 4 SDK. - \endlist */ diff --git a/doc/src/projects/creator-projects-builds-customizing.qdoc b/doc/src/projects/creator-projects-builds-customizing.qdoc index bdd064de477..f58bd2c51c1 100644 --- a/doc/src/projects/creator-projects-builds-customizing.qdoc +++ b/doc/src/projects/creator-projects-builds-customizing.qdoc @@ -26,7 +26,7 @@ \contentspage index.html \previouspage creator-developing-qnx.html \page creator-build-process-customizing.html - \nextpage creator-maemo-emulator.html + \nextpage creator-testing.html \title Customizing the Build Process diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index 5d197a6d8c5..4b77c31b001 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -117,11 +117,6 @@ custom look and feel and QML and C++ code to implement the application logic - \li Qt Quick 1 Application for MeeGo Harmattan - - Use Qt Quick Components for MeeGo Harmattan to design a user - interface with the platform look and feel - \li Qt Quick Application (from Existing QML File) Convert existing Qt Quick applications to projects that you diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc index 7f1c20b7db3..3d98ba56881 100644 --- a/doc/src/projects/creator-projects-running.qdoc +++ b/doc/src/projects/creator-projects-running.qdoc @@ -44,6 +44,5 @@ \include projects/creator-projects-running-desktop.qdocinc \include projects/creator-projects-running-simulator.qdocinc \include linux-mobile/creator-projects-running-generic-linux.qdocinc - \include linux-mobile/creator-projects-running-madde.qdocinc \include qnx/creator-projects-running-qnx.qdocinc */ diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc index 570bfe2967a..b16e8f76e63 100644 --- a/doc/src/projects/creator-projects-settings-build.qdoc +++ b/doc/src/projects/creator-projects-settings-build.qdoc @@ -59,17 +59,6 @@ you can deselect the \gui {Shadow build} checkbox. - Shadow building is not supported for the following device types on - Windows: - - \list - - \li Maemo5 - - \li MeeGo Harmattan - - \endlist - To make in-source builds the default option for all projects, select \gui Tools > \gui Options > \gui {Build & Run} > \gui General, and enter a period (.) in the \gui {Default build directory} field. diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc index 49eff655032..2e3e4b09885 100644 --- a/doc/src/projects/creator-projects-targets.qdoc +++ b/doc/src/projects/creator-projects-targets.qdoc @@ -48,10 +48,6 @@ \li Generic Linux Device - \li Maemo5/Fremantle Device - - \li MeeGo 1.2 Harmattan Device - \li QNX Device \endlist diff --git a/doc/src/qnx/creator-deployment-qnx.qdoc b/doc/src/qnx/creator-deployment-qnx.qdoc index ea5d68299bb..8a60e568e9a 100644 --- a/doc/src/qnx/creator-deployment-qnx.qdoc +++ b/doc/src/qnx/creator-deployment-qnx.qdoc @@ -63,7 +63,7 @@ \section1 Deploying to QNX Neutrino Devices Deploying applications to a QNX Neutrino device is very similar to - \l{Deploying Applications to Linux-Based Devices}. + \l{Deploying Applications to Embedded Linux Devices}. \image qtcreator-qnx-deployment.png "Deploy to device" diff --git a/doc/src/qnx/creator-developing-qnx.qdoc b/doc/src/qnx/creator-developing-qnx.qdoc index ee7def3e6e2..428f46ff96e 100644 --- a/doc/src/qnx/creator-developing-qnx.qdoc +++ b/doc/src/qnx/creator-developing-qnx.qdoc @@ -20,7 +20,7 @@ /*! \contentspage index.html - \previouspage creator-developing-meego.html + \previouspage creator-developing-ios.html \page creator-developing-qnx.html \nextpage creator-build-process-customizing.html diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc index b313baf3251..b3ea299a0e5 100644 --- a/doc/src/qtcreator.qdoc +++ b/doc/src/qtcreator.qdoc @@ -91,12 +91,6 @@ \li \inlineimage creator_advanceduse.png \li \inlineimage creator_gettinghelp.png \row - \li \b {\l{Publishing}} - \list - \li \l{Publishing Qt Content for MeeGo Harmattan Devices} - \li \l{Publishing Qt Content for Maemo Devices} - \li \l{Publishing Maemo Applications to Extras-devel} - \endlist \li \b {\l{Advanced Use}} \list \li \l{Supported Platforms} @@ -216,7 +210,7 @@ \list \li \l{Deploying Applications to Android Devices} \li \l{Deploying Applications to BlackBerry 10 Devices} - \li \l{Deploying Applications to Linux-Based Devices} + \li \l{Deploying Applications to Embedded Linux Devices} \li \l{Deploying Applications to QNX Devices} \endlist \li \l{Connecting Mobile Devices} @@ -226,12 +220,9 @@ \li \l{Connecting BlackBerry 10 Devices} \li \l{Connecting Embedded Linux Devices} \li \l{Connecting iOS Devices} - \li \l{Connecting Maemo Devices} - \li \l{Connecting MeeGo Harmattan Devices} \li \l{Connecting QNX Devices} \endlist \li \l{Customizing the Build Process} - \li \l{Using Maemo or MeeGo Harmattan Emulator} \endlist \li \l{Debugging and Analyzing} \list @@ -259,11 +250,6 @@ \endlist \li \l{Publishing} - \list - \li \l{Publishing Qt Content for Maemo Devices} - \li \l{Publishing Qt Content for MeeGo Harmattan Devices} - \li \l{Publishing Maemo Applications to Extras-devel} - \endlist \li \l{Advanced Use} \list \li \l{Supported Platforms} diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index f2b4693c96e..801ea8fc74c 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -51,8 +51,8 @@ The Qt Quick 1 Application wizard imports Qt Quick 1.1, and therefore, you can use it without changes to develop for platforms - that run Qt 4.7.4 (such as MeeGo). To develop for platforms that run - Qt 4.7.3 (such as Maemo), you must change the import statement to + that run Qt 4.7.4. To develop for platforms that run + Qt 4.7.3, you must change the import statement to import Qt Quick 1.0. The Qt Quick 2 Application wizard imports Qt Quick 2.0. Use it to @@ -116,10 +116,8 @@ > \gui Choose, and follow the instructions of the wizard. \note The SDK for a particular target platform might install additional - templates for that platform. For example, the \gui {Qt Quick Application for - MeeGo Harmattan} template is installed as part of the MeeGo Harmattan tool - chain and the BlackBerry 10 and QNX templates are installed as part of the BlackBerry 10 NDK, - BlackBerry NDK, or QNX SDK. + templates for that platform. For example, the BlackBerry 10 and QNX templates are installed + as part of the BlackBerry 10 NDK, BlackBerry NDK, or QNX SDK. \QC creates the necessary boilerplate files. Some of the files are specific to a particular target platform. |