diff options
Diffstat (limited to 'doc')
22 files changed, 1653 insertions, 1082 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index c161582f7f..8cf07f2c35 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -19,14 +19,13 @@ HELP_DEP_FILES = $$PWD/qtcreator.qdoc \ $$PWD/addressbook-sdk.qdoc \ $$PWD/qt-defines.qdocconf \ $$PWD/qt-html-templates.qdocconf \ - $$PWD/qtcreator.qdocconf \ - $$PWD/qtcreator-online.qdocconf + $$PWD/qtcreator.qdocconf -html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf +html_docs.commands = $$QDOC -creator $$PWD/qtcreator.qdocconf html_docs.depends += $$HELP_DEP_FILES html_docs.files = $$QHP_FILE -html_docs_online.commands = $$QDOC $$PWD/qtcreator-online.qdocconf +html_docs_online.commands = $$QDOC -online $$PWD/qtcreator.qdocconf html_docs_online.depends += $$HELP_DEP_FILES qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE diff --git a/doc/images/qtcreator-screenshot-build-settings.png b/doc/images/qtcreator-screenshot-build-settings.png Binary files differindex 16fa3bfba4..76addfe8ad 100644 --- a/doc/images/qtcreator-screenshot-build-settings.png +++ b/doc/images/qtcreator-screenshot-build-settings.png diff --git a/doc/images/qtcreator-watcher.png b/doc/images/qtcreator-watcher.png Binary files differindex 77bd759482..c54af55e9b 100644 --- a/doc/images/qtcreator-watcher.png +++ b/doc/images/qtcreator-watcher.png diff --git a/doc/maemodev.qdoc b/doc/maemodev.qdoc new file mode 100644 index 0000000000..2ffeab5e5b --- /dev/null +++ b/doc/maemodev.qdoc @@ -0,0 +1,593 @@ +/*! + + \contentspage index.html + \if defined(qcmanual) + \previouspage creator-project-generic.html + \else + \previouspage creator-developing-symbian.html + \endif + \page creator-developing-maemo.html + \if defined(qcmanual) + \nextpage creator-developing-symbian.html + \else + \nextpage smartinstaller.html + \endif + + \title Setting Up Development Environment for Maemo + + Maemo is a software platform developed by Nokia for smartphones and + Internet Tablets. The Maemo SDK provides an open development environment + for different applications on top of the Maemo platform. The necessary + tools from the Maemo SDK are also included in the Nokia Qt SDK. + The whole tool chain that you need to create, build, debug, run, and deploy + Maemo applictions is installed and configured when you install the Nokia + Qt SDK. + + \if defined(qcmanual) + Maemo 5 is based on the Linux 2.6 operating system. For more + information about the Maemo platform, see + \l{http://maemo.org/intro/platform/}{Software Platform} on the Maemo web site. + \endif + + 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.nokia.com/qt-maemo-4.6/platform-notes.html}{Platform Notes - Maemo 5}. + + \section1 Hardware and Software Requirements + + To build and run Qt applications for Maemo, you need the following: + \list + \o Nokia N900 device with software update release 1.2 (V10.2010.19-1) + or later installed. + + \if defined(qcmanual) + \o MADDE cross-platform Maemo development + tool (installed as part of the Nokia Qt SDK). + + For more information about MADDE pertaining to its + installation, configuration, and deployment on the device, see + \l{http://wiki.maemo.org/MADDE}{Introduction to MADDE}. + \endif + + \o 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 Nokia Qt SDK. You can also download them from + \l{https://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 + + The Qt Creator/MADDE integration is supported on the following platforms: + \list + \o Linux (32 bit and 64 bit) + \o Windows (32 bit and 64 bit) + \omit \o Mac OS 10.5 Leopard, or higher \endomit + \endlist + + \note The only supported build system for Maemo in Qt + Creator is qmake. + + \section1 Setting Up the Nokia N900 + + You can connect your device to your development PC using either a USB or + WLAN connection. + + For the device, you need to use a tool called 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 Mad Developer. + + To use an USB connection, you need to set up the Nokia N900 as a network device + on the development PC. + + \note If you plan to connect your development PC to the Nokia N900 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 device and configure + a connection between the development PC and the device. + + To install and configure Mad Developer: + + \list 1 + \o On the Nokia N900, select \gui{Download} > \gui{Development} > \gui{mad-developer} + to install the Mad Developer software package. + \o Click \gui {Mad Developer} to start the Mad Developer application. + + \o 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. + + \o To use an USB connection: + + \list a + + \o 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}. + + \o 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 + + \o Select \gui{Developer Password} to generate a password for a freshly + created user called \bold 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 Qt Creator. + + \image qtcreator-mad-developer-screenshot.png + \endlist + + \section1 Installing Qt Mobility APIs + + To develop applications that use the Qt Mobility APIs, you must install the + APIs on the devices. The APIs are not available in the Nokia N900 package + manager, and therefore, you must install them from the command line as the + root user. To become the root user you must first install \c rootsh from the + application manager. + + \list 1 + + \o On the device, install \c rootsh from the \gui {Application Manager}. + + \o In \gui Programs, select \c {X Terminal} to open a terminal window. + + \o To switch to the root user, enter the following command: + \c{sudo gainroot} + + \o To install Qt Mobility libraries, enter the following command: + \c{apt-get install libqtm-*} + + \o To confirm the installation, enter: \c Y + + \o Close the terminal. + + \endlist + + \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 an USB 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 when configuring + Mad Developer, 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 + + \o Open the Network Connections window. + + \o Select the Linux USB Ethernet + connection that is displayed as a new Local Area Connection. + + \o 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 + \o \gui {IP Address}: \bold {192.168.2.14} + \o \gui SubnetMask: \bold {255.255.255.0} + \o \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 + Nokia N900 to reload the driver with its configuration accordingly. + + \if defined(qcmanual) + \section1 Setting Up MADDE + + If you install Nokia Qt SDK, the MADDE package is installed and + configured automatically on your development PC and you can omit this task. + + \list 1 + + \o Download the MADDE installer file for your platform from the + \l{http://wiki.maemo.org/MADDE}{MADDE} site. + + \o Execute the installer and follow the instructions. + + \o To see which targets are available, run \c{mad-admin list targets}. + + \o To install the target that starts with the string \bold fremantle, use the command: + \c{mad-admin create fremantle-qt-xxx} + + \o In Qt Creator, register the MADDE tool chain: + + \image qtcreator-screenshot-toolchain.png + + \list a + + \o Select \gui Tools > \gui Options... > \gui Qt4 > \gui{Qt Versions}. + + \o Click \inlineimage qtcreator-windows-add.png, + to add a new Qt version. + + The \gui{qmake Location} is the qmake + executable in \c{<MADDE dir>/targets/<fremantle target>/bin}. + + \endlist + + \endlist + + When you have installed the target, you have a toolchain and a sysroot + environment for cross-compiling. + \endif + + \section1 Configuring Connections in Qt Creator + + To be able to run and debug applications on the Maemo emulator and + devices, you must set up a connection to the emulator and the device in the + Qt Creator build and run settings. + \if defined(qcmanual) + If you install Nokia Qt SDK, the + necessary software is installed and configured automatically and you + only need to configure a connection to the device. + + 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 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 Qt Creator. For more information, see + \l{Testing with User Data}. + \endif + + You can protect the connections between Qt Creator and the Maemo emulator + or a device by using either a password or an SSH key. You must always + use a password for the initial connection, but can then deploy an SSH + key and use it for subsequent connections. If you use a password, you + must generate it in Mad Developer and enter it in Qt Creator every time + you connect to the Maemo emulator or to a device. + + If you do not have an SSH key, you can create it in Qt Creator. + Encrypted keys are not supported. For more + information, see + \if defined(qcmanual) + \l{Generating SSH Keys}. + \else + the Qt Creator Manual. + \endif + + \if defined(qcmanual) + To configure connections between Qt Creator and the Maemo emulator or + device: + + \list 1 + + \o If you install the Maemo emulator (QEMU) separately, you must + specify parameters to access it: + + \list a + + \o Start Mad Developer in the emulator. + + \o Click \gui {Developer Password} to generate a password for + the connection. + + \o In Qt Creator, select \gui {Tools > Options... > Projects > + Maemo Device Configurations > Add} to add a new configuration. + + \image qtcreator-maemo-emulator-connection.png + + \o In the \gui {Configuration name} field, enter a name for + the connection. + + \o In the \gui {Device type} field, select \gui {Maemo emulator}. + + \o In the \gui {Authentication type} field, select \gui Password + for the initial connection. + + \o In the \gui Password field, enter the password from the Mad + Developer for the initial connection. + + You can use the default values for the other fields. + + \o Click \gui Test to test the connection. + + \o To avoid having to specify the password every time you connect + to the Maemo emulator, click \gui {Deploy Key...} and select + the file that contains your public key. + + \o When you have deployed the key to the device, change the + configuration to use the SSH key for protection. + + \image qtcreator-maemo-emulator-connection-key.png + + The default location of the private key file is displayed in the + \gui {Private key file} field. + + \endlist + + If you installed the Nokia Qt SDK, a connection has been configured + and you only need to specify the password and deploy the SSH key. + + \o To deploy applications and run them remotely, specify parameters + for accessing devices: + + \list a + + \o Connect your device to the development PC via an USB cable or + a WLAN. For an 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. + + \o Select \gui Tools > \gui Options... > \gui Projects > + \gui{Maemo Device Configurations > Add}, and add a new configuration for a + \gui {Remote device}. + + \image qtcreator-screenshot-devconf.png + + \o In the \gui {Host name} field, enter the IP address from the + \gui usb0 or \gui wlan0 field in Mad Developer. + + \o Specify the other settings in the same way as for a Maemo emulator + connection. + + \o Click \gui Test to test the connection. + + \o Click \gui OK to close the dialog. + + \endlist + + \o To specify build and run settings: + + \list a + + \o Open a project for an application you want to develop for your + Nokia N900. + + \o Click \gui Projects to open the projects mode. + + \o In the \gui{Build Settings} section, choose the MADDE Qt version. + + \image qtcreator-screenshot-build-settings.png + + \o In the \gui{Run Settings} section, click \gui Add to add a new + run configuration. + + \o Set a name and select the device configuration. + + \image qtcreator-screenshot-run-settings.png + + \note You can either add separate run settings for both the Maemo + emulator connection and the device connection or select the + \gui {Device configuration} before you run the application. + + \endlist + + \endlist + + \else + + The Nokia Qt SDK installation program configured a default connection + to the Maemo emulator. You only need to specify the + password and deploy the SSH key. + + \list 1 + + \o To specify authentication for the connection to the Maemo emulator: + + \list a + + \o Start Mad Developer in the emulator. + + \o Click \gui {Developer Password} to generate a password for + the connection. + + \o In Qt Creator, select \gui {Tools > Options... > Projects > + Maemo Device Configurations > Maemo emulator} to specify the + password. + + \image qtcreator-maemo-emulator-connection.png + + \o In the \gui {Authentication type} field, select \gui Password + for the initial connection. + + \o In the \gui Password field, enter the password from the Mad + Developer for the initial connection. + + You can use the default values for the other fields. + + \o Click \gui Test to test the connection. + + \o To avoid having to specify the password every time you connect + to the Maemo emulator, click \gui {Deploy Key...} and select + the file that contains your public key. + + \o When you have deployed the key to the device, change the + configuration to use the SSH key for protection. + + \image qtcreator-maemo-emulator-connection-key.png + + The default location of the private key file is displayed in the + \gui {Private key file} field. + + \endlist + + \o To deploy applications and run them remotely, specify parameters + for accessing devices: + + \list a + + \o Connect your device to the development PC via an USB cable or + a WLAN. For an 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. + + \o Select \gui Tools > \gui Options... > \gui Projects > + \gui{Maemo Device Configurations > Add}, and add a new configuration for a + \gui {Remote device}. + + \image qtcreator-screenshot-devconf.png + + \o In the \gui {Host name} field, enter the IP address from the + \gui usb0 or \gui wlan0 field in Mad Developer. + + \o Specify the other settings in the same way as for a Maemo emulator + connection. + + \o Click \gui Test to test the connection. + + \o Click \gui OK to close the dialog. + + \endlist + + \o To specify build and run settings: + + \list a + + \o Open a project for an application you want to develop for your + Nokia N900. + + \o Click \gui Projects to open the projects mode. + + \o In the \gui{Build Settings} section, choose the MADDE Qt version + that was registered by the installation program. + + \image qtcreator-screenshot-build-settings.png + + \o In the \gui{Run Settings} section, click \gui Add to add a new + run configuration. + + \o Set a name and select the device configuration. + + \image qtcreator-screenshot-run-settings.png + + \note You can either add separate run settings for both the Maemo + emulator connection and the device connection or select the + \gui {Device configuration} before you run the application. + + \o Click the \gui Run button to build and run the application. + + \endlist + + \endlist + \endif + + \if defined(qcmanual) + \section2 Testing with User Data + + 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 + + \o On the device, in \gui Programs, select \c {X Terminal} to open a + terminal window. + + \o To switch to the root user, enter the following command: + \c{sudo gainroot} + + \o To specify the password, enter the following command: + \c {passwd user} + + \o In Qt Creator, Select \gui Tools > \gui Options... > \gui Projects > + \gui{Maemo Device Configurations}. + + \o Specify the username \c user and the password in the device configuration. + + \endlist + + \section2 Generating SSH Keys + + If you do not have an SSH public and private key pair, you can generate it + in Qt Creator. You can specify key length and the key algorithm, RSA or DSA. + If you only use the keys to protect connections to the Maemo emulator or + device, you can use the default values. + + \list 1 + + \o Select \gui {Tools > Options... > Projects > Maemo Device Configurations + > Generate SSH Key...}. + + \o Click \gui {Generate SSH Key}. + + \image qtcreator-ssh-key-configuration.png "SSH Key Configuration dialog" + + \o Click \gui {Save Public Key...} to select the location to save the + public key. + + \o Click \gui {Save Private Key...} to specify the location to save the + private key. + + \o Click \gui Close to close the dialog. + + \endlist + \endif + + \section1 Troubleshooting + + 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 + \o usb0 in Mad Developer on Device + \o USB Network on Development PC + \o Host Name in Qt Creator Build Settings + + \row + \o 172.30.7.15 255.255.255.0 + \o 172.30.7.14 255.255.255.0 + \o 172.30.7.15 + + \row + \o 10.133.133.15 + \o 10.133.133.14 + \o 10.133.133.15 + + \row + \o 192.168.133.15 + \o 192.168.133.14 + \o 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/qt-defines.qdocconf b/doc/qt-defines.qdocconf index a9e8bbd23f..75c21ed7fe 100644 --- a/doc/qt-defines.qdocconf +++ b/doc/qt-defines.qdocconf @@ -11,7 +11,8 @@ defines = Q_QDOC \ QT_DEPRECATED \ Q_NO_USING_KEYWORD \ __cplusplus \ - qtquick + qtquick \ + qcmanual versionsym = QT_VERSION_STR diff --git a/doc/qt-html-templates.qdocconf b/doc/qt-html-templates.qdocconf index 6780d3e095..e0284ebe9a 100644 --- a/doc/qt-html-templates.qdocconf +++ b/doc/qt-html-templates.qdocconf @@ -27,7 +27,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " </div>\n" \ " <div id=\"shortCut\">\n" \ " <ul>\n" \ - " <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt Creator 2.0.80 </a></span></li>\n" \ + " <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt Creator 2.1.0 </a></span></li>\n" \ " <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \ " </a></li>\n" \ " </ul>\n" \ diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 58bfdaa892..351c6c9372 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -286,7 +286,7 @@ Qt Creator displays the raw information provided by the native debuggers in a clear and concise manner with the goal to simplify the debugging process as much as possible without losing the power of the native debuggers. - You can use the native debuggers to debug the C++ language. + You can use the native debuggers to debug C++ applications. You can connect mobile devices to your development PC and debug processes running on the devices. @@ -2697,7 +2697,7 @@ \list 1 - \o Select \gui{File > New File or Project > Qt Application Project > Mobile Qt + \o Select \gui{File > New File or Project > Qt C++ Project > Mobile Qt Application > Choose}. \image qtcreator-new-mobile-project.png "New File or Project dialog" @@ -3119,10 +3119,6 @@ \title Creating a Qt C++ Application - \note This tutorial assumes that you have experience in writing basic Qt - applications, using \QD to design user interfaces and using the Qt - Resource System. - This tutorial describes how to use Qt Creator to create a small Qt application, Text Finder. It is a simplified version of the QtUiTools \l{http://doc.qt.nokia.com/4.7-snapshot/uitools-textfinder.html}{Text Finder} @@ -3130,20 +3126,15 @@ \image qtcreator-textfinder-screenshot.png - \section1 Setting Up Your Environment - - Qt Creator automatically detects whether the location of Qt is in your \c PATH variable. - If you have installed several Qt versions, follow the - instructions in \l{Selecting the Qt version} to set the Qt path. - \section1 Creating the Text Finder Project - \note Create the project with the \gui{Help} mode active so that you can follow + \note Create the project with two instances of Qt Creator open and the \gui{Help} mode + active in one of them so that you can follow these instructions while you work. \list 1 - \o Select \gui{File > New File or Project > Qt Application Project > Qt Gui + \o Select \gui{File > New File or Project > Qt C++ Project > Qt Gui Application > Choose}. \image qtcreator-new-project.png "New File or Project dialog" @@ -3158,11 +3149,14 @@ \o In the \gui {Create in} field, enter the path for the project files. For example, \c {C:\Qt\examples}, and then click \gui{Next}. - The \gui{Select Required Qt Versions} dialog opens. + The target setting dialog opens. + + \image qtcreator-new-project-qt-versions.png "Target setting dialog" - \image qtcreator-new-project-qt-versions.png "Select Required Qt Versions dialog" + \o Select the Qt versions to use as build targets for your project, and click + \gui{Next}. - \o Click \gui{Next} to use the Qt version set in the path in your project. + \note If you have only one Qt version installed, this dialog is skipped. The \gui{Class Information} dialog opens. @@ -3252,7 +3246,7 @@ \o Drag and drop a \gui{Text Edit} widget (\l{http://doc.qt.nokia.com/4.7-snapshot/qtextedit.html}{QTextEdit}) to the form. - \o Select the screen area and click \gui{Lay out Vertically} (or press \gui{Ctr+V}) + \o Select the screen area and click \gui{Lay out Vertically} (or press \gui{Ctrl+L}) to apply a vertical layout (\l{http://doc.qt.nokia.com/4.7-snapshot/qvboxlayout.html}{QVBoxLayout}). \image qtcreator-textfinder-ui.png "Text Finder UI" @@ -3293,11 +3287,11 @@ \list 1 - \o In the \gui{Projects} view, double-click the \c{textfinder.h} file + \o In the \gui{Projects} pane in the \gui {Edit view}, double-click the \c{textfinder.h} file to open it for editing. \o Add a private function - to the \c{private} section, after the \c{Ui::TextFinder} function, as + to the \c{private} section, after the \c{Ui::TextFinder} pointer, as illustrated by the following code snippet: \snippet examples/textfinder/textfinder.h 0 @@ -3311,7 +3305,7 @@ \list 1 - \o In the \gui{Projects} view, double-click the textfinder.cpp file + \o In the \gui{Projects} pane in the \gui Edit view, double-click the textfinder.cpp file to open it for editing. \o Add code to load a text file using @@ -3389,7 +3383,7 @@ \section1 Compiling and Running Your Program Now that you have all the necessary files, click the \inlineimage qtcreator-run.png - button to compile your program. + button to compile and run your program. */ @@ -4140,7 +4134,7 @@ The non-Python versions use the compiled version of the debugging helpers, that you must enable separately. For more information, see - \l{Debugging Helper Library with C++}. + \l{Debugging Helpers Based on C++}. The Python version uses a script version of the debugging helpers that does not need any special setup. @@ -4301,7 +4295,7 @@ around as described in the link provided below: \l http://bugreports.qt.nokia.com/browse/QTBUG-4962. - \endtable + \endtable \section1 Setting the Symbol Server in Windows @@ -4564,6 +4558,9 @@ program is interrupted. To do so, click the \gui Value column, modify the value with the inplace editor, and press \key Enter (or \key Return). + You can enable tooltips in the main editor displaying this information. + For more information, see \l{Showing Tooltips in Debug Mode}. + \note The set of watched items is saved in your session. */ @@ -4660,22 +4657,46 @@ \title Using Debugging Helpers - \section1 Debugging Helper Library with C++ + Qt Creator is able to show complex data types in a customized, + user-extensible manner. For this purpose, it takes advantage of + two technologies, collectively referred to as \e{Debugging Helpers}. - While debugging, Qt Creator dynamically loads a helper library into your - program. This helper library enables Qt Creator to pretty print Qt and STL - types. The Qt SDK package already contains a prebuilt debugging helper + Using the debugging helpers is not \e essential for debugging + with Qt Creator, but they enhance the user's ability to quickly + examine complex data significantly. + + \section1 Debugging Helpers Based on C++ + + This is the first and original approach to display complex data + types. While it has been superseded on most platforms by the more + robust and more flexible second approch using Python scripting, + it is the only feasible one on Windows/MSVC, Mac OS, and + old Linux distributions. Moreover, this approach will automatically + be chosen as fallback in case the Python based approach fails. + + During debugging with the C++ based debugging helpers, + Qt Creator dynamically loads a helper library in form of a DLL or a + shared object into the debugged process. + The Qt SDK package already contains a prebuilt debugging helper library. To create your own debugging helper library, select \gui{Tools} > \gui{Options...} > \gui{Qt4} > \gui{Qt Versions}. As the internal data structures of Qt can change between versions, the debugging helper library is built for each Qt version. - \section1 Debugging Helper Library with Python + \section1 Debugging Helpers Based on Python + + On platforms featuring a Python-enabled version of the gdb debugger, + the data extraction is done by a Python script. This is more robust + as the script execution is separated from the debugged process. It + is also easier to extend as the script is less dependend on the + actual Qt version and does not need compilation. - With the gdb Python version, you can - use debugging helpers also for user defined types. To do so, - define one Python function per user defined type in \c{.gdbinit}. + To extend the shipped Python based debugging helpers for custom types, + define one Python function per user defined type in the + gdb startup file. By default, the following startup file is used: + \c{~/.gdbinit}. To use another file, select \gui {Tools > Options... > Gdb} + and specify a filename in the \gui {Gdb startup script} field. The function name has to be qdump__NS__Foo, where NS::Foo is the class or class template to be examined. Nested namespaces are possible. @@ -5381,465 +5402,6 @@ /*! - - \contentspage index.html - \previouspage creator-project-generic.html - \page creator-developing-maemo.html - \nextpage creator-developing-symbian.html - - \title Setting Up Development Environment for Maemo - - Maemo is a software platform developed by Nokia for smartphones and - Internet Tablets. The Maemo SDK provides an open development environment - for different applications on top of the Maemo platform. The necessary - tools from the Maemo SDK are also included in the Nokia Qt SDK. - The whole tool chain that you need to create, build, debug, run, and deploy - Maemo applictions is installed and configured when you install the Nokia - Qt SDK. - - Maemo 5 is based on the Linux 2.6 operating system. For more - information about the Maemo 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.nokia.com/qt-maemo-4.6/platform-notes.html}{Platform Notes - Maemo 5}. - - \section1 Hardware and Software Requirements - - To build and run Qt applications for Maemo, you need the following: - \list - \o Nokia N900 device with software update release 1.2 (V10.2010.19-1) - or later installed. - \o MADDE cross-platform Maemo development - tool (installed as part of the Nokia Qt SDK). - - For more information about MADDE pertaining to its - installation, configuration, and deployment on the device, see - \l{http://wiki.maemo.org/MADDE}{Introduction to MADDE}. - - \o 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 Nokia Qt SDK. You can also download them from - \l{https://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 - - The Qt Creator/MADDE integration is supported on the following platforms: - \list - \o Linux (32 bit and 64 bit) - \o Windows (32 bit and 64 bit) - \omit \o Mac OS 10.5 Leopard, or higher \endomit - \endlist - - \note The only supported build system for Maemo in Qt - Creator is qmake. - - \section1 Setting Up the Nokia N900 - - You can connect your device to your development PC using either a USB or - WLAN connection. - - For the device, you need to use a tool called 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 Mad Developer. - - To use an USB connection, you need to set up the Nokia N900 as a network device - on the development PC. - - \note If you plan to connect your development PC to the Nokia N900 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 device and configure - a connection between the development PC and the device. - - To install and configure Mad Developer: - - \list 1 - \o On the Nokia N900, select \gui{Download} > \gui{Development} > \gui{mad-developer} - to install the Mad Developer software package. - \o Click \gui {Mad Developer} to start the Mad Developer application. - - \o 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. - - \o To use an USB connection: - - \list a - - \o 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}. - - \o 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 - - \o Select \gui{Developer Password} to generate a password for a freshly - created user called \bold 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 Qt Creator. - - \image qtcreator-mad-developer-screenshot.png - \endlist - - \section1 Installing Qt Mobility APIs - - To develop applications that use the Qt Mobility APIs, you must install the - APIs on the devices. The APIs are not available in the Nokia N900 package - manager, and therefore, you must install them from the command line as the - root user. To become the root user you must first install \c rootsh from the - application manager. - - \list 1 - - \o On the device, install \c rootsh from the \gui {Application Manager}. - - \o In \gui Programs, select \c {X Terminal} to open a terminal window. - - \o To switch to the root user, enter the following command: - \c{sudo gainroot} - - \o To install Qt Mobility libraries, enter the following command: - \c{apt-get install libqtm-*} - - \o To confirm the installation, enter: \c Y - - \o Close the terminal. - - \endlist - - \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 an USB 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 when configuring - Mad Developer, 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 - - \o Open the Network Connections window. - - \o Select the Linux USB Ethernet - connection that is displayed as a new Local Area Connection. - - \o 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 - \o \gui {IP Address}: \bold {192.168.2.14} - \o \gui SubnetMask: \bold {255.255.255.0} - \o \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 - Nokia N900 to reload the driver with its configuration accordingly. - - \section1 Setting Up MADDE - - If you install Nokia Qt SDK, the MADDE package is installed and - configured automatically on your development PC and you can omit this task. - - \list 1 - - \o Download the MADDE installer file for your platform from the - \l{http://wiki.maemo.org/MADDE}{MADDE} site. - - \o Execute the installer and follow the instructions. - - \o To see which targets are available, run \c{mad-admin list targets}. - - \o To install the target that starts with the string \bold fremantle, use the command: - \c{mad-admin create fremantle-qt-xxx} - - \o In Qt Creator, register the MADDE tool chain: - - \image qtcreator-screenshot-toolchain.png - - \list a - - \o Select \gui Tools > \gui Options... > \gui Qt4 > \gui{Qt Versions}. - - \o Click \inlineimage qtcreator-windows-add.png, - to add a new Qt version. - - The \gui{qmake Location} is the qmake - executable in \c{<MADDE dir>/targets/<fremantle target>/bin}. - - \endlist - - \endlist - - When you have installed the target, you have a toolchain and a sysroot - environment for cross-compiling. - - \section1 Configuring Connections in Qt Creator - - To be able to run and debug applications on the Maemo emulator and - devices, you must set up a connection to the emulator and the device in the - Qt Creator build and run settings. If you install Nokia Qt SDK, the - necessary software is installed and configured automatically and you - only need to configure a connection to the device. - - 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 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 Qt Creator. For more information, see - \l{Testing with User Data}. - - You can protect the connections between Qt Creator and the Maemo emulator - or a device by using either a password or an SSH key. You must always - use a password for the initial connection, but can then deploy an SSH - key and use it for subsequent connections. If you use a password, you - must generate it in Mad Developer and enter it in Qt Creator every time - you connect to the Maemo emulator or to a device. - - If you do not have an SSH key, you can create it in Qt Creator. - Encrypted keys are not supported. For more - information, see \l{Generating SSH Keys}. - - To configure connections between Qt Creator and the Maemo emulator or - device: - - \list 1 - - \o If you install the Maemo emulator (QEMU) separately, you must - specify parameters to access it: - - \list a - - \o Start Mad Developer in the emulator. - - \o Click \gui {Developer Password} to generate a password for - the connection. - - \o In Qt Creator, select \gui {Tools > Options... > Projects > - Maemo Device Configurations > Add} to add a new configuration. - - \image qtcreator-maemo-emulator-connection.png - - \o In the \gui {Configuration name} field, enter a name for - the connection. - - \o In the \gui {Device type} field, select \gui {Maemo emulator}. - - \o In the \gui {Authentication type} field, select \gui Password - for the initial connection. - - \o In the \gui Password field, enter the password from the Mad - Developer for the initial connection. - - You can use the default values for the other fields. - - \o Click \gui Test to test the connection. - - \o To avoid having to specify the password every time you connect - to the Maemo emulator, click \gui {Deploy Key...} and select - the file that contains your public key. - - \o When you have deployed the key to the device, change the - configuration to use the SSH key for protection. - - \image qtcreator-maemo-emulator-connection-key.png - - The default location of the private key file is displayed in the - \gui {Private key file} field. - - \endlist - - If you installed the Nokia Qt SDK, a connection has been configured - and you only need to specify the password and deploy the SSH key. - - \o To deploy applications and run them remotely, specify parameters - for accessing devices: - - \list a - - \o Connect your device to the development PC via an USB cable or - a WLAN. For an 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. - - \o Select \gui Tools > \gui Options... > \gui Projects > - \gui{Maemo Device Configurations > Add}, and add a new configuration for a - \gui {Remote device}. - - \image qtcreator-screenshot-devconf.png - - \o In the \gui {Host name} field, enter the IP address from the - \gui usb0 or \gui wlan0 field in Mad Developer. - - \o Specify the other settings in the same way as for a Maemo emulator - connection. - - \o Click \gui Test to test the connection. - - \o Click \gui OK to close the dialog. - - \endlist - - \o To specify build and run settings: - - \list a - - \o Open a project for an application you want to develop for your - Nokia N900. - - \o Click \gui Projects to open the projects mode. - - \o In the \gui{Build Settings} section, choose the MADDE Qt version. - - \image qtcreator-screenshot-build-settings.png - - \o In the \gui{Run Settings} section, click \gui Add to add a new - run configuration. - - \o Set a name and select the device configuration. - - \image qtcreator-screenshot-run-settings.png - - \note You can either add separate run settings for both the Maemo - emulator connection and the device connection or select the - \gui {Device configuration} before you run the application. - - \endlist - - \endlist - - \section2 Testing with User Data - - 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 - - \o On the device, in \gui Programs, select \c {X Terminal} to open a - terminal window. - - \o To switch to the root user, enter the following command: - \c{sudo gainroot} - - \o To specify the password, enter the following command: - \c {passwd user} - - \o In Qt Creator, Select \gui Tools > \gui Options... > \gui Projects > - \gui{Maemo Device Configurations}. - - \o Specify the username \c user and the password in the device configuration. - - \endlist - - \section2 Generating SSH Keys - - If you do not have an SSH public and private key pair, you can generate it - in Qt Creator. You can specify key length and the key algorithm, RSA or DSA. - If you only use the keys to protect connections to the Maemo emulator or - device, you can use the default values. - - \list 1 - - \o Select \gui {Tools > Options... > Projects > Maemo Device Configurations - > Generate SSH Key...}. - - \o Click \gui {Generate SSH Key}. - - \image qtcreator-ssh-key-configuration.png "SSH Key Configuration dialog" - - \o Click \gui {Save Public Key...} to select the location to save the - public key. - - \o Click \gui {Save Private Key...} to specify the location to save the - private key. - - \o Click \gui Close to close the dialog. - - \endlist - - \section1 Troubleshooting - - 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 - \o usb0 in Mad Developer on Device - \o USB Network on Development PC - \o Host Name in Qt Creator Build Settings - - \row - \o 172.30.7.15 255.255.255.0 - \o 172.30.7.14 255.255.255.0 - \o 172.30.7.15 - - \row - \o 10.133.133.15 - \o 10.133.133.14 - \o 10.133.133.15 - - \row - \o 192.168.133.15 - \o 192.168.133.14 - \o 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. - -*/ - - -/*! \contentspage index.html \previouspage creator-debugging-helpers.html \page creator-maemo-emulator.html @@ -5978,118 +5540,6 @@ /*! \contentspage index.html - \previouspage creator-developing-maemo.html - \page creator-developing-symbian.html - \nextpage creator-project-managing-sessions.html - - \title Setting Up Development Environment for Symbian - - For more information about developing applications for the Symbian - platform, select \gui {Help > Index} and look for \gui {Platform Notes}, - or see - \l{http://doc.qt.nokia.com/4.6/platform-notes-symbian.html}{Platform Notes - Symbian}. - - \section1 Hardware and Software Requirements - - Windows is the only development platform for the Symbian target - supported at the moment. - - For deploying and running applications on the device, you need the - following: - \list - \o The Nokia USB drivers that come with \e{PC Suite} or \e{Ovi Suite} - \o The \l{http://tools.ext.nokia.com/trk/}{App TRK} application for - your device - \o The \e{qt_installer.sis} package installed on the device, that is - delivered with the Qt SDK - \o \e {Qt Mobility APIs} installed on the device, if you use them in - applications - \endlist - - To run your applications in the Symbian emulator, you also need - to install Carbide.c++ v2.0.0 or higher. - - \section1 Installing Required Applications on Devices - - The Nokia Qt SDK installation program creates shortcuts for installing - the required applications on Symbian devices (you can also use any of - the standard methods for installing applications on devices): - - \list 1 - - \o Connect the device to the development PC with an USB cable in - PC Suite Mode. If you have not previously used the device with Ovi Suite - or PC Suite, all the necessary drivers are installed automatically. - This takes approximately one minute. - - \o Choose \gui {Start > Nokia Qt SDK > Symbian > Install Qt to Symbian - device} and follow the instructions on the screen to install Qt 4.6.2 - libraries on the device. - - \o Choose \gui {Start > Nokia Qt SDK > Symbian > Install QtMobility to Symbian - device} and follow the instructions on the screen to install Qt - mobility libraries on the device. - - \o Choose \gui {Start > Nokia Qt SDK > Symbian > Install TRK to Symbian - device} and follow the instructions on the screen to install the TRK - debugging application on the device. - - \note To check the Symbian platform version of your device, see - \l{http://www.forum.nokia.com/devices}{Device Details}. - - \endlist - - \note If errors occur during the installation, copy the .sis files from - \c {<NokiaQtSDK_install_path>\Symbian\sis} to the device using USB storage - mode. Then install them from the file manager on the device. - - \section1 Adding Symbian Platform SDKs - - Nokia Qt SDK contains all the tools you need for developing Qt applications for - Symbian devices. To use Symbian APIs directly in your applications, you can - install additional Symbian Platform SDKs: - - \list - \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/} - {S60 Platform SDK 3rd Edition FP1 or higher}. - \o Either the GCCE ARM Toolchain that is included in the Symbian - SDKs, or RVCT 2.2 [build 686] or later (which is not available free - of charge)(Your environment needs to find the compiler in the PATH). - \o Qt for Symbian 4.6.2 or later, installed into the Symbian SDKs you want - to use. - - \endlist - - \section2 Setting Up Qt Creator - - When you run Qt Creator after installing the Symbian SDK and Qt for - Symbian, the installed SDKs and their corresponding Qt versions are - automatically detected. For each detected Symbian SDK with Qt, a special entry - is made in the Qt version management settings in \gui{Tools} > - \gui{Options...} > \gui{Qt4} > \gui{Qt Versions}. - - \note If you manually add a Qt version for Symbian, you must - also manually specify the Symbian SDK to use for this version. - - \image qtcreator-qt4-qtversions-win-symbian.png - - If you want to run your applications in the Symbian emulator, you need to - point Qt Creator to the Metrowerks Compiler that you want to use, by - setting the \gui{Carbide directory} of the Qt version to the corresponding - Carbide.c++ installation directory. - - You can check which Symbian SDKs and corresponding Qt versions are found in the - \gui{Tools} > \gui{Options...} > \gui{Qt4} > \gui{S60 SDKs} preference - page. - - \image qtcreator-qt4-s60sdks.png - - - -*/ - -/*! - \contentspage index.html \previouspage creator-usability.html \page adding-plugins.html \nextpage creator-visual-editor.html @@ -6268,7 +5718,7 @@ To move forward in the location history, press \key {Alt+Right} (\key {Cmd+Opt+Right} on Mac OS). To move backward, press \key {Alt+Left} - (\key {Cmd+Opt+Right} on Mac OS). For example, if you use the \gui Locator + (\key {Cmd+Opt+Left} on Mac OS). For example, if you use the \gui Locator to jump to a symbol in the same file, you can jump back to your original location in that file by pressing \key {Alt+Left}. @@ -6394,6 +5844,15 @@ \o Uncheck the \gui{Use Debugging Helper} checkbox. \endlist + \section1 Showing Tooltips in Debug Mode + + To inspect the value of variables from the editor, you can turn + on tooltips. Tooltips are hidden by default for performance reasons. + + \list 1 + \o Select \gui Tools > \gui Options... > \gui Debugger > \gui General. + \o Select the \gui {Use tooltips in main editor while debugging} check box. + \endlist \section1 Locating Files diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index d1565c7ed1..285be65d55 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -14,17 +14,17 @@ indexes = qt.index include(qt-defines.qdocconf) -sources.fileextensions = "qtcreator.qdoc addressbook-sdk.qdoc" +sources.fileextensions = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressbook-sdk.qdoc" qhp.projects = QtCreator qhp.QtCreator.file = qtcreator.qhp -qhp.QtCreator.namespace = com.nokia.qtcreator.2080 +qhp.QtCreator.namespace = com.nokia.qtcreator.210 qhp.QtCreator.virtualFolder = doc qhp.QtCreator.indexTitle = Qt Creator -qhp.QtCreator.filterAttributes = qtcreator 2.0.80 -qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.0.80 -qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.0.80 +qhp.QtCreator.filterAttributes = qtcreator 2.1.0 +qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.1.0 +qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.1.0 qhp.QtCreator.indexRoot = qhp.QtCreator.extraFiles = \ style/style.css \ @@ -32,10 +32,16 @@ qhp.QtCreator.extraFiles = \ style/style_ie7.css \ style/style_ie8.css \ style/OfflineStyle.css \ + style/narrow.css \ + style/OfflineStyle.css \ + style/superfish.css \ + style/superfish_skin.css \ images/qt-logo.png \ images/qtcreator-screenshots.png \ scripts/functions.js \ scripts/jquery.js \ + scripts/narrow.js \ + scripts/superfish.js \ images/api_examples.png \ images/api_lookup.png \ images/arrow_down.png \ diff --git a/doc/symbiandev.qdoc b/doc/symbiandev.qdoc new file mode 100644 index 0000000000..98ac737b83 --- /dev/null +++ b/doc/symbiandev.qdoc @@ -0,0 +1,154 @@ +/*! + \contentspage index.html + \if defined(qcmanual) + \previouspage creator-developing-maemo.html + \else + \previouspage nokiaqtsdk-gs.html + \endif + \page creator-developing-symbian.html + \if defined(qcmanual) + \nextpage creator-project-managing-sessions.html + \else + \nextpage creator-developing-maemo.html + \endif + + \title Setting Up Development Environment for Symbian + + For more information about developing applications for the Symbian + platform, select \gui {Help > Index} and look for \gui {Platform Notes}, + or see + \l{http://doc.qt.nokia.com/4.6/platform-notes-symbian.html}{Platform Notes - Symbian}. + + \section1 Hardware and Software Requirements + + Windows is the only development platform for the Symbian target + supported at the moment. + + For deploying and running applications on the device, you need the + following: + \list + \o The Nokia USB drivers that come with \e{PC Suite} or \e{Ovi Suite} + \o The + \if defined(qcmanual) + \l{http://tools.ext.nokia.com/trk/}{App TRK} + \else + \e {App TRK} + \endif + application for your device + \o The \e{qt_installer.sis} package installed on the device, that is + delivered with the Qt SDK + \o \e {Qt Mobility APIs} installed on the device, if you use them in + applications + \endlist + + \if defined(qcmanual) + To run your applications in the Symbian emulator, you also need + to install Carbide.c++ v2.0.0 or higher. + \endif + + \section1 Installing Required Applications on Devices + + The Nokia Qt SDK installation program creates shortcuts for installing + the required applications on Symbian devices (you can also use any of + the standard methods for installing applications on devices): + + \list 1 + + \o Connect the device to the development PC with an USB cable in + PC Suite Mode. If you have not previously used the device with Ovi Suite + or PC Suite, all the necessary drivers are installed automatically. + This takes approximately one minute. + + \o Choose \gui {Start > Nokia Qt SDK > Symbian > Install Qt to Symbian + device} and follow the instructions on the screen to install Qt 4.6.2 + libraries on the device. + + \o Choose \gui {Start > Nokia Qt SDK > Symbian > Install QtMobility to Symbian + device} and follow the instructions on the screen to install Qt + mobility libraries on the device. + + \o Choose \gui {Start > Nokia Qt SDK > Symbian > Install TRK to Symbian + device} and follow the instructions on the screen to install the TRK + debugging application on the device. + + \note To check the Symbian platform version of your device, see + \l{http://www.forum.nokia.com/devices}{Device Details}. + + \endlist + + \note If errors occur during the installation, copy the .sis files from + \c {<NokiaQtSDK_install_path>\Symbian\sis} to the device using USB storage + mode. Then install them from the file manager on the device. + + \if defined(qcmanual) + \section1 Adding Symbian Platform SDKs + + Nokia Qt SDK contains all the tools you need for developing Qt applications for + Symbian devices. To use Symbian APIs directly in your applications, you can + install additional Symbian Platform SDKs: + + \list + \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/} + {S60 Platform SDK 3rd Edition FP1 or higher}. + \o Either the GCCE ARM Toolchain that is included in the Symbian + SDKs, or RVCT 2.2 [build 686] or later (which is not available free + of charge)(Your environment needs to find the compiler in the PATH). + \o Qt for Symbian 4.6.2 or later, installed into the Symbian SDKs you want + to use. + + \endlist + + \section2 Setting Up Qt Creator + + When you run Qt Creator after installing the Symbian SDK and Qt for + Symbian, the installed SDKs and their corresponding Qt versions are + automatically detected. For each detected Symbian SDK with Qt, a special entry + is made in the Qt version management settings in \gui{Tools} > + \gui{Options...} > \gui{Qt4} > \gui{Qt Versions}. + + \note If you manually add a Qt version for Symbian, you must + also manually specify the Symbian SDK to use for this version. + + \image qtcreator-qt4-qtversions-win-symbian.png + + If you want to run your applications in the Symbian emulator, you need to + point Qt Creator to the Metrowerks Compiler that you want to use, by + setting the \gui{Carbide directory} of the Qt version to the corresponding + Carbide.c++ installation directory. + + You can check which Symbian SDKs and corresponding Qt versions are found in the + \gui{Tools} > \gui{Options...} > \gui{Qt4} > \gui{S60 SDKs} preference + page. + + \image qtcreator-qt4-s60sdks.png + + \else + + \section1 Building and Running Applications + + You can test your application on a device by building and running + it from Qt Creator for the \gui {Symbian Device} target. + + \list 1 + + \o Connect the device to the development PC through a USB cable. + The target selector displays a green check mark when a + device is connected. + + \image qtcreator-qt4-symbian-device-connected.png + + The tool tip of the target selector shows more details about the actual + device that will be used when you run your application. + + \o Start the \gui{App TRK} application on your device and deny the + Bluetooth connection. + + \o Select \gui Options to select USB as connection type. + + \o Click the \gui Run button in Qt Creator. + + \endlist + + \endif + +*/ diff --git a/doc/templates/images/bg_l.png b/doc/templates/images/bg_l.png Binary files differindex 95470c78cc..90b1da10b9 100755 --- a/doc/templates/images/bg_l.png +++ b/doc/templates/images/bg_l.png diff --git a/doc/templates/images/bg_l_blank.png b/doc/templates/images/bg_l_blank.png Binary files differindex e0eca3f1c3..5a9673d81b 100755 --- a/doc/templates/images/bg_l_blank.png +++ b/doc/templates/images/bg_l_blank.png diff --git a/doc/templates/images/bg_r.png b/doc/templates/images/bg_r.png Binary files differindex 42a35a546f..f0fb121dea 100755 --- a/doc/templates/images/bg_r.png +++ b/doc/templates/images/bg_r.png diff --git a/doc/templates/images/box_bg.png b/doc/templates/images/box_bg.png Binary files differindex 232655a818..3322f923f8 100755 --- a/doc/templates/images/box_bg.png +++ b/doc/templates/images/box_bg.png diff --git a/doc/templates/images/breadcrumb.png b/doc/templates/images/breadcrumb.png Binary files differindex f0571ce1b5..0ded5514d2 100755 --- a/doc/templates/images/breadcrumb.png +++ b/doc/templates/images/breadcrumb.png diff --git a/doc/templates/images/bullet_gt.png b/doc/templates/images/bullet_gt.png Binary files differindex 88759256ce..7561b4edc4 100755 --- a/doc/templates/images/bullet_gt.png +++ b/doc/templates/images/bullet_gt.png diff --git a/doc/templates/images/bullet_sq.png b/doc/templates/images/bullet_sq.png Binary files differindex db85ee3400..a84845e3c7 100755 --- a/doc/templates/images/bullet_sq.png +++ b/doc/templates/images/bullet_sq.png diff --git a/doc/templates/images/bullet_up.png b/doc/templates/images/bullet_up.png Binary files differindex 285e7411b4..7de2f06954 100644 --- a/doc/templates/images/bullet_up.png +++ b/doc/templates/images/bullet_up.png diff --git a/doc/templates/images/page_bg.png b/doc/templates/images/page_bg.png Binary files differindex fb7d051a28..9b3bd999df 100755 --- a/doc/templates/images/page_bg.png +++ b/doc/templates/images/page_bg.png diff --git a/doc/templates/scripts/functions.js b/doc/templates/scripts/functions.js index 58a0248591..faa4ca4937 100644 --- a/doc/templates/scripts/functions.js +++ b/doc/templates/scripts/functions.js @@ -63,11 +63,9 @@ function processNokiaData(response){ if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){ lookupCount++; - for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){ full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue; full_li_element = full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd; - $('#ul001').append(full_li_element); $('#ul001 .defaultLink').css('display','none'); @@ -77,7 +75,6 @@ function processNokiaData(response){ if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){ articleCount++; - for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){ full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue; full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ; @@ -103,10 +100,13 @@ function processNokiaData(response){ if(i==propertyTags.length){$('#pageType').removeClass('loading');} } + if(lookupCount > 0){$('#ul001 .menuAlert').remove();$('#ul001').prepend('<li class=\"menuAlert liveResult hit\">Found ' + lookupCount + ' hits</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');} + if(articleCount > 0){$('#ul002 .menuAlert').remove();$('#ul002').prepend('<li class=\"menuAlert liveResult hit\">Found ' + articleCount + ' hits</li>');$('#ul002 li').css('display','block');} + if(exampleCount > 0){$('#ul003 .menuAlert').remove();$('#ul003').prepend('<li class=\"menuAlert liveResult hit\">Found ' + articleCount + ' hits</li>');$('#ul003 li').css('display','block');} - if(lookupCount == 0){$('#ul001').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');} - if(articleCount == 0){$('#ul002').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');} - if(exampleCount == 0){$('#ul003').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');} + if(lookupCount == 0){$('#ul001 .menuAlert').remove();$('#ul001').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');} + if(articleCount == 0){$('#ul002 .menuAlert').remove();$('#ul002').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');} + if(exampleCount == 0){$('#ul003 .menuAlert').remove();$('#ul003').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');} // reset count variables; lookupCount=0; articleCount = 0; @@ -121,6 +121,7 @@ function CheckEmptyAndLoadList() var pageVal = $('title').html(); $('#feedUrl').remove(); $('#pageVal').remove(); + $('.menuAlert').remove(); $('#feedform').append('<input id="feedUrl" name="feedUrl" value="'+pageUrl+'" style="display:none;">'); $('#feedform').append('<input id="pageVal" name="pageVal" value="'+pageVal+'" style="display:none;">'); $('.liveResult').remove(); @@ -160,7 +161,8 @@ else var searchString = $('#pageType').val() ; if ((searchString == null) || (searchString.length < 3)) { $('#pageType').removeClass('loading'); - $('.liveResult').remove(); // replaces removeResults(); + $('.liveResult').remove(); + $('.searching').remove(); CheckEmptyAndLoadList(); $('.report').remove(); // debug$('.content').prepend('<li>too short or blank</li>'); // debug @@ -169,9 +171,8 @@ else if (this.timer) clearTimeout(this.timer); this.timer = setTimeout(function () { $('#pageType').addClass('loading'); - // debug$('.content').prepend('<li>new search started </li>');// debug - // debug$('.content').prepend('<p class=\"report\">Search string ' +searchString +'</p>'); // debug - + $('.searching').remove(); + $('.list ul').prepend('<li class="menuAlert searching">Searching...</li>'); $.ajax({ contentType: "application/x-www-form-urlencoded", url: 'http://' + location.host + '/nokiasearch/GetDataServlet', @@ -180,9 +181,10 @@ else type: 'post', success: function (response, textStatus) { - $('.liveResult').remove(); // replaces removeResults(); - $('#pageType').removeClass('loading'); - + $('.liveResult').remove(); + $('.searching').remove(); + $('#pageType').removeClass('loading'); + $('.list ul').prepend('<li class="menuAlert searching">Searching...</li>'); processNokiaData(response); } diff --git a/doc/templates/scripts/narrow.js b/doc/templates/scripts/narrow.js index 12d0ce89d5..35c81bf4a4 100644 --- a/doc/templates/scripts/narrow.js +++ b/doc/templates/scripts/narrow.js @@ -59,9 +59,20 @@ var narrowInit = function() { } $(document).ready(function(){ - if ($('body').hasClass('narrow')) { +/* if ($('body').hasClass('narrow')) { narrowInit(); } + */ + if($(window).width()<600) { + $('body').addClass('narrow'); + + if ($("#narrowsearch").length == 0) { + narrowInit(); + } + } + else { + $('body').removeClass('narrow'); + } }); $(window).bind('resize', function () { diff --git a/doc/templates/style/narrow.css b/doc/templates/style/narrow.css index 05159aa568..349048fd8c 100644 --- a/doc/templates/style/narrow.css +++ b/doc/templates/style/narrow.css @@ -15,7 +15,12 @@ } .narrow .footer { - margin: 0; + margin: 0px; + } + + .creator .header, .creator .header .content, .creator .footer, .creator .wrapper { + margin: 0px; + min-width: 300px; } .narrow .header { @@ -49,7 +54,7 @@ .narrow .header .qtref a { - color: #363534; + color: #00732F; } .narrow .header .qtref span @@ -98,7 +103,7 @@ } .narrow .header #shortCut ul li a { - color: #44a51c; + color: #00732F; } .narrow .wrapper .hd @@ -126,6 +131,11 @@ margin: 0 5px 0 5px; } + .creator .wrap + { + margin: 0px; + background:#FFFFFF; + } .narrow .wrap .toolbar { border-bottom: none; @@ -135,7 +145,14 @@ { padding-top: 15px; } - + .creator .wrap .content + { + padding-top: 10px; + } + .creator .wrap .content .guide + { + padding-top: 15px; + } .narrow .wrap .feedback { display: none; diff --git a/doc/templates/style/style.css b/doc/templates/style/style.css index 90cfa2c214..190c60a1d9 100644 --- a/doc/templates/style/style.css +++ b/doc/templates/style/style.css @@ -1,6 +1,8 @@ @media screen { - html + +/* basic elements */ + html { color: #000000; background: #FFFFFF; @@ -18,6 +20,7 @@ fieldset, img { border: 0; + max-width:100%; } address, caption, cite, code, dfn, em, strong, th, var, optgroup { @@ -39,7 +42,6 @@ h1, h2, h3, h4, h5, h6 { font-size: 100%; -/* font-weight: normal; */ } q:before, q:after { @@ -50,11 +52,7 @@ border: 0; font-variant: normal; } - sup - { - vertical-align: baseline; - } - sub + sup, sub { vertical-align: baseline; } @@ -62,19 +60,6 @@ { word-spacing:5px; } - .heading - { - font: normal 600 16px/1.0 Arial; - padding-bottom: 15px; - } - .subtitle - { - font-size: 13px; - } - .small-subtitle - { - font-size: 13px; - } legend { color: #000000; @@ -90,9 +75,19 @@ { font-size: 100%; } + strong + { + font-weight: bold; + } + em + { + font-style: italic; + } + + /* adding Qt theme */ html { - background-color: #e5e5e5; + /* background-color: #e5e5e5;*/ } body { @@ -100,73 +95,119 @@ font: normal 13px/1.2 Verdana; color: #363534; } - strong + a { - font-weight: bold; + color: #00732f; + text-decoration: none; } - em + hr { - font-style: italic; + background-color: #E6E6E6; + border: 1px solid #E6E6E6; + height: 1px; + width: 100%; + text-align: left; + margin: 15px 0px 15px 0px; } - a + + pre { - color: #00732f; - text-decoration: none; + border: 1px solid #DDDDDD; + -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; + margin: 0 20px 10px 10px; + padding: 20px 15px 20px 20px; + overflow-x: auto; } - .header, .footer, .wrapper + table, pre { - min-width: 600px; - max-width: 1500px; - margin: 0 30px; + -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; + background-color: #F6F6F6; + border: 1px solid #E6E6E6; + border-collapse: separate; + font-size: 11px; + margin-bottom: 25px; } - .wrapper + pre.highlightedCode { + display: block; + overflow:hidden; + } + thead { - background: url(../images/bg_r.png) repeat-y 100% 0; + margin-top: 5px; + font:600 12px/1.2 Arial; } - .wrapper .hd + th { - padding-left: 216px; - height: 15px; - background: url(../images/page.png) no-repeat 0 0; - overflow: hidden; + padding: 5px 15px 5px 15px; + background-color: #E1E1E1; + border-left: 1px solid #E6E6E6; } - .offline .wrapper .hd + td { - background: url(../images/page.png) no-repeat 0 -15px; + padding: 3px 15px 3px 20px; } - .wrapper .hd span + tr.odd td:hover, tr.even td:hover {} + + td.rightAlign + { + padding: 3px 5px 3px 10px; + } + table tr.odd { - height: 15px; - display: block; - overflow: hidden; - background: url(../images/page.png) no-repeat 100% -30px; + border-left: 1px solid #E6E6E6; + background-color: #F6F6F6; + color: #66666E; } - .wrapper .bd + table tr.even { - background: url(../images/bg_l.png) repeat-y 0 0; - position: relative; + border-left: 1px solid #E6E6E6; + background-color: #ffffff; + color: #66666E; } - .offline .wrapper .bd + table tr.odd td:hover, table tr.even td:hover { - background: url(../images/bg_l_blank.png) repeat-y 0 0; + /* background-color: #E6E6E6;*/ /* disabled until further notice */ } - .wrapper .ft + + span.comment { - padding-left: 216px; - height: 15px; - background: url(../images/page.png) no-repeat 0 -75px; - overflow: hidden; + color: #8B0000; + font-style: italic; } - .offline .wrapper .ft + span.string, span.char { - background: url(../images/page.png) no-repeat 0 -90px; + color: #254117; } - .wrapper .ft span + + +/* end basic elements */ + +/* font style elements */ + .heading { - height: 15px; - display: block; - background: url(../images/page.png) no-repeat 100% -60px; - overflow: hidden; + font: normal bold 16px/1.0 Arial; + padding-bottom: 15px; + } + .subtitle + { + font-size: 13px; + } + .small-subtitle + { + font-size: 13px; + } +/* end font style elements */ + +/* global settings*/ + .header, .footer, .wrapper + { + min-width: 600px; + max-width: 1500px; + margin: 0 30px; } .header, .footer { @@ -174,6 +215,17 @@ clear: both; overflow: hidden; } + .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after + { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + } + +/* end global settings*/ +/* header elements */ .header { height: 115px; @@ -201,7 +253,247 @@ text-indent: -999em; background: url(../images/sprites-combined.png) no-repeat -78px -235px; } + .content a:visited + { + color: #4c0033; + text-decoration: none; + } + .content a:visited:hover + { + color: #4c0033; + text-decoration: underline; + } + + #nav-topright + { + height: 70px; + } + + #nav-topright ul + { + list-style-type: none; + float: right; + width: 370px; + margin-top: 11px; + } + + #nav-topright li + { + display: inline-block; + margin-right: 20px; + float: left; + } + + #nav-topright li.nav-topright-last + { + margin-right: 0; + } + + #nav-topright li a + { + background: transparent url(../images/sprites-combined.png) no-repeat; + height: 18px; + display: block; + overflow: hidden; + text-indent: -9999px; + } + + #nav-topright li.nav-topright-home a + { + width: 65px; + background-position: -2px -91px; + } + + #nav-topright li.nav-topright-home a:hover + { + background-position: -2px -117px; + } + + + #nav-topright li.nav-topright-dev a + { + width: 30px; + background-position: -76px -91px; + } + + #nav-topright li.nav-topright-dev a:hover + { + background-position: -76px -117px; + } + + + #nav-topright li.nav-topright-labs a + { + width: 40px; + background-position: -114px -91px; + } + + #nav-topright li.nav-topright-labs a:hover + { + background-position: -114px -117px; + } + + #nav-topright li.nav-topright-doc a + { + width: 32px; + background-position: -162px -91px; + } + + #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a + { + background-position: -162px -117px; + } + + #nav-topright li.nav-topright-blog a + { + width: 40px; + background-position: -203px -91px; + } + + #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a + { + background-position: -203px -117px; + } + + #nav-topright li.nav-topright-shop a + { + width: 40px; + background-position: -252px -91px; + } + + #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a + { + background-position: -252px -117px; + } + + #nav-logo + { + background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px; + left: -3px; + position: absolute; + width: 75px; + height: 75px; + top: 13px; + } + #nav-logo a + { + width: 75px; + height: 75px; + display: block; + text-indent: -9999px; + overflow: hidden; + } + + + .shortCut-topleft-inactive + { + padding-left: 3px; + background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px; + height: 20px; + width: 47px; + } + .shortCut-topleft-inactive span + { + font-variant: normal; + } + .shortCut-topleft-inactive span a:hover, .shortCut-topleft-active a:hover + { + text-decoration:none; + } + #shortCut + { + padding-top: 10px; + font-weight: bolder; + color: #b0adab; + } + #shortCut ul + { + list-style-type: none; + float: left; + width: 347px; + margin-left: 100px; + } + #shortCut li + { + display: inline-block; + margin-right: 25px; + float: left; + white-space: nowrap; + } + #shortCut li a + { + color: #b0adab; + } + #shortCut li a:hover + { + color: #44a51c; + } + + + +/* end header elements */ +/* content and sidebar elements */ + .wrapper + { + background: url(../images/bg_r.png) repeat-y 100% 0; + } + .wrapper .hd + { + padding-left: 216px; + height: 15px; + background: url(../images/page.png) no-repeat 0 0; + overflow: hidden; + } + + + + + .wrapper .hd span + { + height: 15px; + display: block; + overflow: hidden; + background: url(../images/page.png) no-repeat 100% -30px; + } + .wrapper .bd + { + background: url(../images/bg_l.png) repeat-y 0 0; + position: relative; + } + + + + + .wrapper .ft + { + padding-left: 216px; + height: 15px; + background: url(../images/page.png) no-repeat 0 -75px; + overflow: hidden; + } + + + + .wrapper .ft span + { + height: 15px; + display: block; + background: url(../images/page.png) no-repeat 100% -60px; + overflow: hidden; + } + .navTop{ + float:right; + display:block; + padding-right:15px; + + + } + + + +/* end content and sidebar elements */ +/* sidebar elements */ .sidebar { float: left; @@ -210,10 +502,10 @@ font-size: 11px; } - .offline .sidebar, .offline .feedback, .offline .t_button - { - display: none; - } + + + + .sidebar .searchlabel { @@ -239,7 +531,7 @@ width: 158px; height: 19px; padding: 0; - border: none; + border: 0px; outline: none; font: 13px/1.2 Verdana; } @@ -256,9 +548,8 @@ .sidebar .box h2 { - font: normal 18px/1.2 Arial; + font: bold 16px/1.2 Arial; padding: 0; - min-height: 32px; } .sidebar .box h2 span { @@ -271,10 +562,6 @@ } .sidebar #lookup.box h2 span { - background: url(../images/sprites-combined.png) no-repeat -6px -311px; - width: 27px; - height: 35px; - margin-right: 13px; } .sidebar .box#topics h2 { @@ -282,10 +569,6 @@ } .sidebar #topics.box h2 span { - background: url(../images/sprites-combined.png) no-repeat -94px -311px; - width: 27px; - height: 32px; - margin-right: 13px; } .sidebar .box#examples h2 { @@ -293,32 +576,25 @@ } .sidebar #examples.box h2 span { - background: url(../images/sprites-combined.png) no-repeat -48px -311px; - width: 30px; - height: 31px; - margin-right: 9px; } .sidebar .box .list { display: block; max-height:200px; + min-height:120px; overflow-y:auto; overflow-x:none; } - .sidebar .box .live - { - display: none; - height: 100px; - overflow: auto; - } - .list li a:hover, .live li a:hover + .list li a:hover { text-decoration: underline; } .sidebar .box ul { - padding:10px; + padding-bottom:5px; + padding-left:10px; + padding-top:5px; } .sidebar .box ul li { @@ -330,15 +606,52 @@ { background: url(../images/box_bg.png) repeat-x 0 bottom; } + .sidebar .box ul li.noMatch + { + background: none; + color:#FF2A00; + font-style:italic; + } + .sidebar .box ul li.hit + { + background: none; + color:#AAD2F0; + font-style:italic; + } + .sidebar .search form input.loading + { + background:url("../images/spinner.gif") no-repeat scroll right center transparent; + } + +.floatingResult{ + z-index:1; + position:relative; + padding-top:0px; + background-color:white; + border:solid 1px black; + height:250px; + width:600px; + overflow-x:hidden; + overflow-y:auto; +} + + .floatingResult:hover{ + display:block; + } + .floatingResult:hover{ + } + +/* end sidebar elements */ +/* content elements */ .wrap { margin: 0 5px 0 208px; overflow: visible; } - .offline .wrap - { - margin: 0 5px 0 5px; - } + + + + .wrap .toolbar { background-color: #fafafa; @@ -424,8 +737,11 @@ color: #00732F; } - .offline .wrap .breadcrumb + + .wrap .content { + padding: 30px; + word-wrap:break-word; } .wrap .breadcrumb ul @@ -453,62 +769,54 @@ padding-left: 0; margin-left: 0; } - .wrap .content - { - padding: 30px; - word-wrap: break-word; - } + + + + .wrap .content ol li { + background:none; + font:normal 10pt/1 Verdana; + + margin-bottom:10px; + margin-left:12px; + /*list-style-type:disc;*/ + } + .wrap .content li { - padding-left: 12px; background: url(../images/bullet_sq.png) no-repeat 0 5px; font: normal 400 10pt/1 Verdana; - /* color: #44a51c;*/ margin-bottom: 10px; - } - .content li:hover - { - /* text-decoration: underline;*/ + padding-left:12px; } - .wrap .content ol li { - background:none; - font: inherit; - margin-bottom:10px; - padding-left: 0px - } - .wrap .content ol li { - list-style-type:decimal; - } - .wrap .content .descr ol li { - margin-left: 45px; - } - .wrap .content { - padding-top: 15px; - } - .wrap .content ol img { - vertical-align: middle; - } - .wrap .content ul img { - vertical-align: middle; - } + + + + + .content li:hover {} .wrap .content h1 { - font: 600 18px/1.2 Arial; + font: bold 18px/1.2 Arial; } .wrap .content h2 { - font: 600 16px/1.2 Arial; + border-bottom:1px solid #DDDDDD; + font:600 16px/1.2 Arial; + margin-top:15px; + width:100%; } .wrap .content h3 { - font: 600 14px/1.2 Arial; + font: bold 14px/1.2 Arial; + font:600 16px/1.2 Arial; + margin-top:15px; + width:100%; } .wrap .content p { @@ -530,25 +838,6 @@ color: #4c0033; text-decoration: underline; } - .content a:visited - { - color: #4c0033; - text-decoration: none; - } - .content a:visited:hover - { - color: #4c0033; - text-decoration: underline; - } .footer - { - min-height: 100px; - color: #797775; - font: normal 9px/1 Verdana; - text-align: center; - padding-top: 40px; - background-color: #E6E7E8; - margin: 0; - } .feedback { float: none; @@ -565,265 +854,38 @@ color: #00732F; text-decoration: underline; } - .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after - { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; - } - #nav-topright - { - height: 70px; - } - - #nav-topright ul - { - list-style-type: none; - float: right; - width: 370px; - margin-top: 11px; - } - - #nav-topright li - { - display: inline-block; - margin-right: 20px; - float: left; - } - - #nav-topright li.nav-topright-last - { - margin-right: 0; - } - - #nav-topright li a - { - background: transparent url(../images/sprites-combined.png) no-repeat; - height: 18px; - display: block; - overflow: hidden; - text-indent: -9999px; - } - - #nav-topright li.nav-topright-home a - { - width: 65px; - background-position: -2px -91px; - } - - #nav-topright li.nav-topright-home a:hover - { - background-position: -2px -117px; - } - - - #nav-topright li.nav-topright-dev a - { - width: 30px; - background-position: -76px -91px; - } - - #nav-topright li.nav-topright-dev a:hover - { - background-position: -76px -117px; - } - - - #nav-topright li.nav-topright-labs a - { - width: 40px; - background-position: -114px -91px; - } - - #nav-topright li.nav-topright-labs a:hover - { - background-position: -114px -117px; - } - - #nav-topright li.nav-topright-doc a - { - width: 32px; - background-position: -162px -91px; - } - - #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a - { - background-position: -162px -117px; - } - - #nav-topright li.nav-topright-blog a - { - width: 40px; - background-position: -203px -91px; - } - - #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a - { - background-position: -203px -117px; - } - - #nav-topright li.nav-topright-shop a - { - width: 40px; - background-position: -252px -91px; - } - - #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a - { - background-position: -252px -117px; - } - - #nav-logo - { - background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px; - left: -3px; - position: absolute; - width: 75px; - height: 75px; - top: 13px; - } - #nav-logo a - { - width: 75px; - height: 75px; - display: block; - text-indent: -9999px; - overflow: hidden; - } - - - .shortCut-topleft-inactive - { - padding-left: 3px; - padding-right: 3px; - background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px; - height: 20px; - } - .shortCut-topleft-inactive span - { - font-variant: normal; - } - .shortCut-topleft-inactive span a:hover, .shortCut-topleft-active a:hover - { - text-decoration:none; + .alphaChar{ + width:100%; + background-color:#F6F6F6; + border:1px solid #E6E6E6; + -moz-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + font-size:12pt; + padding-left:10px; + margin-top:10px; + margin-bottom:10px; } - #shortCut - { - padding-top: 10px; - font-weight: bolder; - color: #b0adab; - } - #shortCut ul - { - list-style-type: none; - float: left; - margin-left: 100px; - } - #shortCut li - { - display: inline-block; - margin-right: 25px; - float: left; - white-space: nowrap; - } - #shortCut li a - { - color: #b0adab; - } - #shortCut li a:hover - { - color: #44a51c; - } + .flowList{ + vertical-align:top; + } - hr - { - background-color: #E6E6E6; - border: 1px solid #E6E6E6; - height: 1px; - width: 100%; - text-align: left; - margin: 15px 0px 15px 0px; - } + .flowList dl{ + } + .flowList dd{ + display:inline-block; + margin-left:10px; + width:250px; + } + .wrap .content .flowList p{ + padding:0px; + } .content .alignedsummary { margin: 15px; } - pre - { - border: 1px solid #DDDDDD; - margin: 0 20px 10px 10px; - padding: 20px 15px 20px 20px; - overflow-x: auto; - } - table, pre - { - -moz-border-radius: 7px 7px 7px 7px; - background-color: #F6F6F6; - border: 1px solid #E6E6E6; - border-collapse: separate; - font-size: 11px; - /*min-width: 395px;*/ - margin-bottom: 25px; - display: inline-block; - } - thead - { - margin-top: 5px; - font:600 12px/1.2 Arial; - } - th - { - padding: 5px 15px 5px 15px; - background-color: #E1E1E1; - /* border-bottom: 1px solid #E6E6E6;*/ - border-left: 1px solid #E6E6E6; - /* border-right: 1px solid #E6E6E6;*/ - } - td - { - padding: 3px 15px 3px 20px; - /* border-left: 1px solid #E6E6E6; - border-right: 1px solid #E6E6E6;*/ - } - tr.odd td:hover, tr.even td:hover - { - /* border-right: 1px solid #C3C3C3; - border-left: 1px solid #C3C3C3;*/ - } - - td.rightAlign - { - padding: 3px 15px 3px 10px; - } - table tr.odd - { - border-left: 1px solid #E6E6E6; - background-color: #F6F6F6; - color: #66666E; - } - table tr.even - { - border-left: 1px solid #E6E6E6; - background-color: #ffffff; - color: #66666E; - } - table tr.odd td:hover, table tr.even td:hover - { - background-color: #E6E6E6; - } - - span.comment - { - color: #8B0000; - font-style: italic; - } - span.string, span.char - { - color: #254117; - } + .qmltype { @@ -832,12 +894,14 @@ } .qmlreadonly { + padding-left: 5px; float: right; color: #254117; } .qmldefault { + padding-left: 5px; float: right; color: red; } @@ -849,16 +913,17 @@ *.qmlitem p { } - #feedbackBox { display: none; -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; border: 1px solid #DDDDDD; position: fixed; top: 100px; left: 33%; - height: 190px; + height: 230px; width: 400px; padding: 5px; background-color: #e6e7e8; @@ -882,12 +947,25 @@ height: 120px; margin: 0px 25px 10px 15px; } + #noteHead + { + font-weight:bold; + padding:10px 10px 10px 20px; + } #feedsubmit { display: inline; float: right; margin: 4px 32px 0 0; } + + .note + { + font-size:7pt; + padding-bottom:3px; + padding-left:20px; + } + #blurpage { display: none; @@ -904,6 +982,8 @@ { float: right; -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; background-color: #F6F6F6; border: 1px solid #DDDDDD; margin: 0 20px 10px 10px; @@ -914,14 +994,16 @@ .toc h3, .generic a { - font: 600 12px/1.2 Arial; + font: bold 12px/1.2 Arial; } .generic{ - max-width:75%; } .generic td{ - padding:0; + padding:5px; + } + .generic .alphaChar{ + margin-top:5px; } .generic .odd .alphaChar{ @@ -935,7 +1017,9 @@ .alignedsummary{} .propsummary{} .memItemLeft{} - .memItemRight{} + .memItemRight{ + padding:3px 15px 3px 0; + } .bottomAlign{} .highlightedCode { @@ -943,7 +1027,9 @@ } .LegaleseLeft{} .valuelist{} - .annotated{} + .annotated td{ + padding: 3px 5px 3px 5px; + } .obsolete{} .compat{} .flags{} @@ -963,6 +1049,16 @@ padding-left: 0px; } + .wrap .content .toc h3{ + border-bottom:0px; + margin-top:0px; + } + + .wrap .content .toc h3 a:hover{ + color:#00732F; + text-decoration:none; + } + .wrap .content .toc .level2 { @@ -979,10 +1075,11 @@ font: normal 10px/1.2 Verdana; background: url(../images/bullet_dn.png) no-repeat 0 5px; } - .relpage { -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; border: 1px solid #DDDDDD; padding: 25px 25px; clear: both; @@ -998,12 +1095,16 @@ } h3.fn, span.fn { + -moz-border-radius:7px 7px 7px 7px; + -webkit-border-radius:7px 7px 7px 7px; + border-radius:7px 7px 7px 7px; background-color: #F6F6F6; border-width: 1px; border-style: solid; border-color: #E6E6E6; font-weight: bold; word-spacing:3px; + padding:3px 5px; } .functionIndex { @@ -1014,6 +1115,9 @@ border-width: 1px; border-style: solid; border-color: #E6E6E6; + -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; width:100%; } @@ -1040,6 +1144,24 @@ .functionIndex a{ display:inline-block; } + +/* end content elements */ +/* footer elements */ + + .footer + { + min-height: 100px; + color: #797775; + font: normal 9px/1 Verdana; + text-align: center; + padding-top: 40px; + background-color: #E6E7E8; + margin: 0; + } +/* end footer elements */ + + + /* start index box */ .indexbox @@ -1051,15 +1173,15 @@ .indexboxcont { display: block; - /* overflow: hidden;*/ + } .indexboxbar { background: transparent url(../images/horBar.png ) repeat-x left bottom; margin-bottom: 25px; - /* background-image: none; - border-bottom: 1px solid #e2e2e2;*/ + + } .indexboxcont .section @@ -1110,7 +1232,7 @@ .content .indexboxcont li { - font: normal 600 13px/1 Verdana; + font: normal bold 13px/1 Verdana; } .indexbox a:hover, .indexbox a:visited:hover @@ -1159,60 +1281,267 @@ visibility: hidden; } -.sidebar .search form input.loading -{ - background:url("../images/spinner.gif") no-repeat scroll right center transparent; -} - /* end of screen media */ - -.flowList{ -vertical-align:top; -} -.alphaChar{ -width:100%; -background-color:#F6F6F6; -border:1px solid #E6E6E6; -font-size:12pt; -padding-left:10px; -margin-top:10px; -margin-bottom:10px; -} -.flowList dl{ -} -.flowList dd{ -display:inline-block; -margin-left:10px; -width:250px; -} -.wrap .content .flowList p{ -padding:0px; -} -pre.highlightedCode { - display: block; - overflow:hidden; -} +/* start of creator spec*/ + .creator + { + margin-left:0px; + margin-right:0px; + padding-left:0px; + padding-right:0px; + } + .creator .wrap .content ol li { + list-style-type:decimal; + + } + .creator .header .icon, + .creator .feedback, + .creator .t_button, + .creator .feedback, + .creator #feedbackBox, + .creator #feedback, + .creator #blurpage, + /*.creator .indexbox .indexIcon span,*/ + .creator .wrapper .hd, +/* .creator .indexbox .indexIcon,*/ + .creator .header #nav-logo, + .creator #offlinemenu, + .creator #offlinesearch, + .creator .header #nav-topright, + .creator .header #shortCut , + .creator .wrapper .hd, + .creator .wrapper .ft, + .creator .sidebar, + .creator .wrap .feedback + { + display:none; + } + + body.creator + { + background: none; + + font: normal 13px/1.2 Verdana; + color: #363534; + background-color: #FAFAFA; + } + + + + .creator .header, .footer, .wrapper + { + max-width: 1500px; + margin: 0px; + } + .creator .wrapper + { + position:relative; + top:5px; + } + .creator .wrapper .bd + { + + background:#FFFFFF; + } + + + .creator .header, .footer + { + display: block; + clear: both; + overflow: hidden; + } + .creator .wrap .content p + + { + line-height: 20px; + padding: 5px; + } + + .creator .header .qtref span + { + background:none; + } + + + + .creator .footer + { + border-top:1px solid #E5E5E5; + min-height: 100px; + margin:0px; + } + + .creator .wrap + { + + padding:0 5px 0 5px; + margin: 0px; + } + .creator .wrap .toolbar + { + + + border-bottom:1px solid #E5E5E5; + /*width:100%;*/ + margin-left:-5px; + margin-right:-5px; + } + .creator .wrap .breadcrumb ul li a + { + /* color: #363534;*/ + color: #00732F; + } + + .creator .wrap .content + { + padding: 0px; + word-wrap:break-word; + } + + .creator .wrap .content ol li { + background:none; + font: inherit; + padding-left: 0px; + } + + .creator .wrap .content .descr ol li { + margin-left: 45px; + + } + .creator .content .alignedsummary + { + margin: 5px; + width:100%; + } + .creator .generic{ + max-width:75%; + } + .creator .generic td{ + padding:0; + } + .creator .indexboxbar + { + border-bottom:1px solid #E5E5E5; + margin-bottom: 25px; + background: none; + } + + + + .creator .header + { + width: 100%; + margin: 0; + height: auto; + background-color: #ffffff; + padding: 10px 0 5px 0; + overflow: visible; + border-bottom: solid #E5E5E5 1px; + z-index:1; + + + + + + + + + /* position:fixed;*/ + } + + + .creator .header .content + { + } + .creator .header .qtref + { + color: #00732F; + position: static; + float: left; + margin-left: 5px; + font: bold 18px/1 Arial; + } + + .creator .header .qtref:visited + { + color: #00732F; + } + .creator .header .qtref:hover + { + color: #00732F; + text-decoration:none; + } + .creator .header .qtref span + { + background-image: none; + text-indent: 0; + text-decoration:none; + } + + + + + + + .creator .wrap .toolbar + { + display:block; + padding-top:0px; + } + + + + .creator .wrap .breadcrumb ul li { + font-weight: normal; + } + + .creator .wrap .breadcrumb ul li a { + /*color: #44a51c;*/ + } + + .creator .wrap .breadcrumb ul li.last a { + /*color: #363534;*/ + } + + .creator #narrowmenu ul + { + border-bottom:solid 1px #E5E5E5; + border-left:solid 1px #E5E5E5; + border-right:solid 1px #E5E5E5; + } + + .creator #narrowmenu li ul { + margin-top:-15px; + } + + + .creator .toc { + margin:10px 20px 10px 10px; + } +/* end of creator spec*/ + } + /* end of screen media */ /* start of print media */ @media print { - input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft + input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult { display: none; background: none; } .content { - position: absolute; - top: 0px; - left: 0px; background: none; display: block; + width: 100%; margin: 0; float: none; + } } /* end of print media */ |
