Commit c718095c authored by con's avatar con
Browse files

Merge commit 'origin/1.3'

Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp

Reviewed-by: Oswald Buddenhagen
parents 6bf1e262 fc52fd89
doc/images/qtcreator-qt4-s60sdks.png

39.4 KB | W: | H:

doc/images/qtcreator-qt4-s60sdks.png

51.5 KB | W: | H:

doc/images/qtcreator-qt4-s60sdks.png
doc/images/qtcreator-qt4-s60sdks.png
doc/images/qtcreator-qt4-s60sdks.png
doc/images/qtcreator-qt4-s60sdks.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -27,7 +27,7 @@
\o \l{A Quick Tour of Qt Creator}
\o \l{Creating a Project in Qt Creator}
\o \l{The Code Editor}
\o \l{Build Settings}
\o \l{Project Settings}
\o \l{Qt Version Management}
\o \l{Writing a Simple Program with Qt Creator}
\o \l{Qt Creator and Version Control Systems}
......@@ -397,7 +397,7 @@
Qt Creator automatically detects if \c qmake is in the environment variable
\c PATH. This \l{glossary-system-qt}{version of Qt} is referred to as
\bold{Auto-detected Qt}. If you intend to use only one version of Qt - it is
\bold{Qt in PATH}. If you intend to use only one version of Qt - it is
already in your path and correctly set up for command line usage - you do
not need to manually configure your Qt version.
......@@ -413,7 +413,8 @@
\i \image qtcreator-qt4-qtversions.png
On Linux and Mac OS X, simply set the \gui{Path to QMake}
to the \c qmake binary of the Qt installation. If a Qt is
found in the \c PATH environment variable, it will show up.
found in the \c PATH environment variable, it will show up
automatically as \gui{Qt in PATH}.
On both platforms, the platforms Gnu Compiler Collection (GCC)
is used to compile Qt. On Mac OS, the GCC compiler is part of XCode.
......@@ -445,13 +446,20 @@
\row
\i \image qtcreator-qt4-qtversions-win-symbian.png
If you are using Qt for Symbian and your S60 SDK is registered
with \c devices.exe, Qt Creator will detect the Qt version automatically.
A known issue is that you cannot just point Creator to \c qmake.exe of Qt for Symbian.
You can add the path to the Metrowerks Compiler (\gui {MWC Directory})
if you want to use to build for the emulator. This requires Carbide 2.0
to be installed. the MWC directory should then point to the directory
of your Carbide installation. However, this not needed for compiling for
the device.
with \c devices.exe, Qt Creator will detect the Qt version
automatically. These are shown in the \bold{Auto-detected}
section in the options dialog.
You can also manually add Qt for Symbian versions. In this case
you need to tell Qt Creator the path to the S60 SDK
it is supposed to use with these Qt installations.
Add the path to your Carbide C++ install, version 2.0
or later, if you want to build for the emulator
(\c WINSCW tool chain).
If you want to use \c GCCE to build for your device,
you might need to add the path to the
\c{CSL Arm Toolchain} directory (\gui{CSL/GCCE Directory}),
if the compiler is not found in the \c PATH environment
variable.
\endtable
\note By default projects are compiled with the
......@@ -1600,31 +1608,27 @@
For each detected S60 SDK with Qt, a special entry is made in the Qt Version Management settings
\gui{Tools -> Options... -> Qt4 -> Qt Versions}.
\e{Note that you must use one of these special Qt version entries for building projects
for the emulator or devices. You can not just point Qt Creator to the qmake executable
like you would do for a desktop version of Qt.}
\e{Note that if you manually add a Qt version for Symbian, you must
also manually specify the S60 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{MWC Directory}
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 what S60 SDKs and corresponding Qt versions are found in the
\gui{Tools -> Options... -> Qt4 -> S60 SDKs} preference page.
At the moment it is not possible to override the autodetected settings.
\image qtcreator-qt4-s60sdks.png
\section2 Setting up Your Project
\section2 Building your Project
After installing all the prerequisites and checking the setup in Qt Creator as described
above, you need to make some settings for your project.
\e{Note that the only supported build system for Qt for Symbian applications in Qt Creator
is qmake.}
\section3 Building your Project
Before you can build your project for the Symbian Platform you need to create build
configurations for it.
Open \gui{Projects mode} and make sure that your project is selected for editing in
......@@ -1644,11 +1648,26 @@
\image qtcreator-symbian-change-buildconfiguration.png
\section2 Running your Project
\section3 Running your Project in the Emulator
Similar to the build configuration setup for your project you need to create a run
configuration for running your project in the Symbian emulator: Switch to \gui{Projects mode}
and in \gui{Run Settings} you will find the \gui{Add -> YourApplication in Symbian Emulator}
button.
\image qtcreator-symbian-add-run-in-emulator.png
To start your project in the emulator select this run configuration as the active configuration
at the top of \gui{Projects mode} and press the run button.
\image qtcreator-symbian-change-run-in-emulator.png
\section3 Running your Project on the Device
Similar to the build configuration setup for your project you need to create a run configuration
for running your project on a Symbian device. Add a new run configuration in \gui{Projects mode}
via \gui{Run Settings}, \gui{Add -> YourApplication on Symbian Device} button.
To run your project on a real Symbian device, just add another run configuration in
\gui{Projects mode} via \gui{Run Settings}, \gui{Add -> YourApplication on Symbian Device} button.
\image qtcreator-symbian-add-runconfiguration.png
......@@ -1664,11 +1683,19 @@
\image qtcreator-symbian-change-runconfiguration.png
\section2 Troubleshooting
When something goes wrong check the following things:
\list
\o Is the device run configuration selected as the active run configuration?
\o Did you build your application with one of the special Qt versions created for the
S60 SDKs?
\o Did you build your application with a Qt version for Symbian?
\o Are the settings for the Qt version you use to build your project correct? Check the
path to the S60 SDK, and if you need to specify the path to your compiler tool chain.
\o Is the emulator/device run configuration selected as the active run configuration?
\o Did you build using the right toolchain, i. e. WINSCW for running in the Emulator,
GCCE or RVCT for running on the device?
\o If the emulator process could not be started, try closing Creator and starting the
application directly from your file manager. Having done this, Creator should be
able to run your projects in the Emulator.
\o Is the device connected via USB in \e{PC Suite} mode?
\o Is App TRK running on the device, using the USB connection, and does it have status
\e{connected}?
......@@ -1887,11 +1914,12 @@
\row
\o
\raw HTML
Auto-detected Qt
Qt in PATH
\endraw
\target glossary-system-qt
\o The version of Qt installed on your system. This is the Qt
version for the \c qmake command found in your \c PATH.
\o This is the Qt
version for the \c qmake command found in your \c PATH
environment variable.
\row
\o
......
......@@ -2135,19 +2135,23 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
*value = qvariant_cast<QColor>(*v).name();
break;
case QVariant::KeySequence:
#ifndef QT_NO_SHORTCUT
*value = qvariant_cast<QKeySequence>(*v).toString();
#else
*value = QString::fromLatin1("Disabled by QT_NO_SHORTCUT");
#endif
break;
case QVariant::SizePolicy:
*value = sizePolicyValue(qvariant_cast<QSizePolicy>(*v));
break;
#endif
default: {
static const char *qTypeFormat = sizeof(void *) == sizeof(long) ?
"'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)0x%lx)" :
"'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)0x%llx)";
static const char *nonQTypeFormat = sizeof(void *) == sizeof(long) ?
"'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)0x%lx)" :
"'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)0x%llx)";
static const char *qTypeFormat = sizeof(void *) == sizeof(long)
? "'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)0x%lx)"
: "'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)0x%llx)";
static const char *nonQTypeFormat = sizeof(void *) == sizeof(long)
? "'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)0x%lx)"
: "'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)0x%llx)";
char buf[1000];
const char *format = (v->typeName()[0] == 'Q') ? qTypeFormat : nonQTypeFormat;
qsnprintf(buf, sizeof(buf) - 1, format, v->typeName(), v->typeName(), v);
......
......@@ -12009,8 +12009,8 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location/>
<source>CLS/GCCE Directory:</source>
<translation>CLS/GCCE:</translation>
<source>CSL/GCCE Directory:</source>
<translation>CSL/GCCE:</translation>
</message>
</context>
<context>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment