diff --git a/doc/images/qtcreator-gs-build-example-open.png b/doc/images/qtcreator-gs-build-example-open.png
index 06f74d1bfeaeea3c8539031da65184b0746b4eb8..3b533272b788ae6502e3d3e087497a2be21e34ac 100644
Binary files a/doc/images/qtcreator-gs-build-example-open.png and b/doc/images/qtcreator-gs-build-example-open.png differ
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 76525da967e998e2bf059aeda604169e8c3e61ef..0b53d793cdd78e41bcfab8c1248f4da83f673f12 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -5709,7 +5709,8 @@
\list 1
\o Select \gui Projects to select the Qt version to build the
- application. For more information, see \l{Supported Configurations}.
+ application. For more information, see
+ \l{Selecting Qt Versions in Qt Creator}.
\o Select the \gui {Symbian Device} build target for your project.
@@ -6453,7 +6454,8 @@
\list 1
\o On the \gui Welcome page, select the \gui {Show Examples and Demos}
- check box, and then select \gui {Clocks} in the list of examples.
+ check box, and then search for \gui {Toys: Clocks Example} in the list
+ of examples.
\image qtcreator-gs-build-example-open.png "Selecting an example"
diff --git a/doc/symbiandev.qdoc b/doc/symbiandev.qdoc
index 61289c09f6b29ec3ed6fe2bc6032dc6a82bc2efd..43e50641ce6871d765318b001f1d2cd3706a2796 100644
--- a/doc/symbiandev.qdoc
+++ b/doc/symbiandev.qdoc
@@ -64,9 +64,10 @@
You can run Qt applications on Symbian devices if the software that Qt
applications require (typically Qt, Qt Mobility, QtWebkit, and Open C) is
installed on the device. On Symbian^3 and later devices, some version of Qt
- is pre-installed. On earlier devices, you must install the modules that Qt
- applications require. For more information, see
- \l{Installing Required Applications on Devices}.
+ is pre-installed. To deploy applications to earlier devices, you can package
+ the application with Nokia Smart Installer for Symbian to automatically
+ install the modules that Qt applications require. For more information, see
+ \l{Qt on Symbian Devices}.
To run and debug applications on Symbian devices from Qt Creator, you must
install the CODA on-device debugging agent on the device. For more
@@ -87,7 +88,7 @@
\if defined(qcmanual)
\l{Building with Remote Compiler}.
\else
- \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-remote-compiler.html}
+ \l{http://doc.qt.nokia.com/qtcreator/creator-remote-compiler.html}
{Building with Remote Compiler}.
\endif
@@ -103,7 +104,7 @@
\endif
- \section1 Installing Required Applications on Devices
+ \section1 Qt on Symbian Devices
Generally, when developing for Symbian^3 or later devices, you do not need
to install Qt on devices. However, you might want to upgrade or downgrade
@@ -115,9 +116,9 @@
\note Earlier Qt for Symbian versions, such as Qt 4.6.3 for Symbian, are
only available in the \QSDK online installer. For more information, see
\if defined(qcmanual)
- \l{http://doc.qt.nokia.com/sdk-1.1/sdk-installing.html}{Installing Qt SDK}.
+ \l{http://doc.qt.nokia.com/sdk/sdk-installing.html}{Installing Qt SDK}.
\else
- {Installing Qt SDK}.
+ \l{Installing Qt SDK}.
\endif
@@ -125,7 +126,8 @@
\list
- \o Symbian Belle devices contain Qt 4.7.4 libraries as part of device
+ \o Symbian Belle devices contain Qt 4.7.4 and Qt Mobility 1.2.1
+ libraries as part of device
firmware (ROM). To upgrade the Qt version, update the device
firmware. You cannot downgrade the Qt version on Belle devices.
@@ -135,14 +137,26 @@
not overwritten. It is eclipsed by the installed Qt on the C: drive.
\endomit
- \o Symbian Anna devices have Qt 4.7.3 pre-installed.
+ \o Symbian Anna devices have Qt 4.7.3 and Qt Mobility 1.1.3
+ pre-installed.
- \o Symbian^3 devices have Qt 4.6 pre-installed.
+ \o Symbian^3 devices have Qt 4.6.3 pre-installed, but they do not have
+ Qt Mobility libraries pre-installed. If you use Qt Mobility features
+ in your application, package the application with Nokia Smart
+ Installer for Symbian to have the necessary dependencies installed
+ automatically.
- \o S60 5th Edition and later devices support Qt 4.6.3 and 4.7.3.
+ \o Symbian^1 (S60 5th Edition) devices support Qt 4.6.3 and 4.7.3, but
+ it is not pre-installed to them. Package Qt applications with Nokia Smart
+ Installer for Symbian to have the latest Qt and Qt Mobility versions
+ that the device supports installed to the device.
- \o S60 3rd Edition feature pack 1 and later devices support Qt 4.6 for
- Symbian through Nokia Smart Installer for Symbian.
+ \note As an exception, the Nokia C6-00 PR4 has Qt 4.7.3 and Qt
+ Mobility 1.1.3 preinstalled.
+
+ \o S60 3rd Edition feature pack 1 and later devices support Qt 4.6, but
+ it is not pre-installed to them. Package Qt applications with Nokia
+ Smart Installer for Symbian.
\endlist
@@ -161,7 +175,7 @@
Installer support in Qt applications, see
\l{http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian}{Nokia Smart Installer for Symbian}.
- \section2 Supported Configurations
+ \section2 Selecting Qt Versions in Qt Creator
When you select the Qt version to build the application with, consider
which version provides the application with the widest support on different
@@ -169,61 +183,75 @@
that applications that are built against Qt 4.6.3 also run on Qt 4.7.3.
Similarly, applications that are supported on S60 5th Edition are also
supported
- on Symbian^3. However, dependencies, such as QML or Qt Mobility API
+ on Symbian^3. However, dependencies, such as Qt Quick or Qt Mobility API
versions might restrict the choice of Qt versions that you have.
- In general, if you use only Qt widgets and APIs in the application, you
+ In general, if you use only Qt 4.6 APIs in the application, you
can use \gui {Qt 4.6.3 for Symbian^1} to build it.
The application is supported on both Symbian^1 and Symbian^3 devices.
- If you use QML in the application, you can use \gui {Qt 4.7.3 for
+ If you use Qt Quick in the application, you can use \gui {Qt 4.7.3 for
Symbian^1} to build it. The application is supported on both Symbian^1 and
Symbian^3 devices.
If you use native Symbian APIs, you must check that they are available on
the target devices. For more information about the API differences between
- Symbian^1 (S60 5th Edition) and Symbian^3, see the \bold {Symbian
+ Symbian^1 and Symbian^3, see the \bold {Symbian
Reference Documentation for Qt}, which is delivered together with \QSDK
and which you can view in the \gui Help mode.
+ You can use a set of ready-made UI components called Qt Quick Components
+ for Symbian that enforce a Nokia UI look and feel.
+ \omit
+ \note We recomment that you use Qt Quick Components version 1.1, because
+ they contain usability and other improvements. The same set of devices
+ supports both 1.0 and 1.1.
+ \endomit
+
The following table summarizes the supported configurations for each Qt
version available in Qt Creator build settings:
\table
\header
\i Qt Version
- \i QML
+ \i Qt Quick
+ \i Qt Quick Components
\i Qt Mobility Version
\i Native Symbian C++ APIs
\i Open GL
\row
\i Qt 4.6.3 for Symbian^1 (S60 5th Edition)
\i No
+ \i No
\i 1.0.2
\i No
\i No
\row
\i Qt 4.6.3 for Symbian^3
\i No
+ \i No
\i 1.0.2
\i Yes
\i No
\row
\i Qt 4.7.3 for Symbian^1
- \i Yes
+ \i 1.0
+ \i No
\i 1.1.3
\i No
\i No
\row
\i Qt 4.7.3 for Symbian^3
- \i Yes
+ \i 1.0
+ \i Yes \omit 1.0 \endomit
\i 1.1.3
\i Yes
\i Yes
\row
\i Qt 4.7.4 for Symbian Belle
- \i Yes
- \i 1.2
+ \i 1.1
+ \i Yes \omit 1.1 \endomit
+ \i 1.2.1
\i Yes
\i Yes
\endtable
diff --git a/src/libs/utils/process_stub_win.c b/src/libs/utils/process_stub_win.c
index f9cffbab7aa51e1a0536da08d3a877f48d099a7e..f309689b671bc5e2bf77b72f21652200bba5f354 100644
--- a/src/libs/utils/process_stub_win.c
+++ b/src/libs/utils/process_stub_win.c
@@ -118,6 +118,7 @@ int main()
PROCESS_INFORMATION pi;
DEBUG_EVENT dbev;
enum RunMode mode = Run;
+ HANDLE image = NULL;
argv = CommandLineToArgvW(GetCommandLine(), &argc);
@@ -196,6 +197,8 @@ int main()
do {
if (!WaitForDebugEvent (&dbev, INFINITE))
systemError("Cannot fetch debug event, error %d\n");
+ if (dbev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT)
+ image = dbev.u.CreateProcessInfo.hFile;
if (dbev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT) {
/* The first exception to be delivered is a trap
which indicates completion of startup. */
@@ -207,6 +210,8 @@ int main()
} while (dbev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT);
if (!DebugActiveProcessStop(dbev.dwProcessId))
systemError("Cannot detach from debugee, error %d\n");
+ if (image)
+ CloseHandle(image);
}
SetConsoleCtrlHandler(ctrlHandler, TRUE);
@@ -216,6 +221,8 @@ int main()
if (WaitForSingleObject(pi.hProcess, INFINITE) == WAIT_FAILED)
systemError("Wait for debugee failed, error %d\n");
+ CloseHandle(pi.hProcess);
+ CloseHandle(pi.hThread);
doExit(0);
return 0;
}
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 7f7e4b8e363457a7ec615cf1714f2556e12e7a28..0981fd9b7a304a8779e550a978c4582e764b882c 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -173,6 +173,7 @@ plugin_bookmarks.depends += plugin_texteditor
plugin_debugger.subdir = debugger
plugin_debugger.depends = plugin_projectexplorer
plugin_debugger.depends += plugin_coreplugin
+plugin_debugger.depends += plugin_cpptools
plugin_fakevim.subdir = fakevim
plugin_fakevim.depends = plugin_coreplugin
diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri
index d0b68ece2a0decae56be851bc93dd8b50257ba12..e624bcc5e8cde00a0ddaae7b54dea01b960f47ad 100644
--- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri
+++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri
@@ -15,3 +15,8 @@ HEADERS += $$PWD/customstyleplugin.h $$PWD/../designercore/include/iwidgetplugi
RESOURCES += $$PWD/customstyleplugin.qrc
OTHER_FILES += $$PWD/customstyle.metainfo
+
+!macx {
+ target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
+ INSTALLS += target
+}
diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
index 302272967e2ed0349cb7b4b9444f0f84b1f52e8b..22e7883586fbc07def94150f06f1007cbb3d3c4f 100644
--- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
@@ -15,3 +15,8 @@ HEADERS += $$PWD/desktopplugin.h $$PWD/../designercore/include/iwidgetplugin.h
RESOURCES += $$PWD/desktopplugin.qrc
OTHER_FILES += $$PWD/desktop.metainfo
+
+!macx {
+ target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
+ INSTALLS += target
+}
diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
index 12f923cb1e5a97d2c58477fdeba8a1f3e322271d..8110260be95d1febfcef90e2842ecad59378a598 100644
--- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
+++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
@@ -15,3 +15,8 @@ HEADERS += $$PWD/extrasplugin.h $$PWD/../designercore/include/iwidgetplugin.h
RESOURCES += $$PWD/extrasplugin.qrc
OTHER_FILES += $$PWD/extras.metainfo
+
+!macx {
+ target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
+ INSTALLS += target
+}
diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri b/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
index 04abc8987494dff64bf38a751e7d137b7a7ba48e..659122a2f96403691747923dc5457e98a115053f 100644
--- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
+++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
@@ -15,3 +15,8 @@ HEADERS += $$PWD/meegoplugin.h $$PWD/../designercore/include/iwidgetplugin.h
RESOURCES += $$PWD/meegoplugin.qrc
OTHER_FILES += $$PWD/meego.metainfo
+
+!macx {
+ target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
+ INSTALLS += target
+}
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
index 5870c378726e037e33d988179f9806fabd8f3660..98fc9c7f1a139ef27b6c04c1c8a3bc09f025e055 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
@@ -15,3 +15,8 @@ HEADERS += $$PWD/qtquickplugin.h $$PWD/../designercore/include/iwidgetplugin.h
RESOURCES += $$PWD/qtquickplugin.qrc
OTHER_FILES += $$PWD/quick.metainfo
+
+!macx {
+ target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
+ INSTALLS += target
+}
diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri b/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri
index 28d6323c68a1a9d9c0d76fdf33a052828982501f..a874ef08b4031db4af7eb2e09c6b59c32cc88b7a 100644
--- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri
+++ b/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri
@@ -15,3 +15,8 @@ HEADERS += $$PWD/symbianplugin.h $$PWD/../designercore/include/iwidgetplugin.h
RESOURCES += $$PWD/symbianplugin.qrc
OTHER_FILES += $$PWD/symbian.metainfo
+
+!macx {
+ target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
+ INSTALLS += target
+}
diff --git a/src/plugins/remotelinux/qt4maemotarget.cpp b/src/plugins/remotelinux/qt4maemotarget.cpp
index f43934473fc9ca9b0a3ad444250120db5e77eb34..1a46836ac625070e2ae5ba12be729ddeabcd51d9 100644
--- a/src/plugins/remotelinux/qt4maemotarget.cpp
+++ b/src/plugins/remotelinux/qt4maemotarget.cpp
@@ -1143,7 +1143,9 @@ QString Qt4HarmattanTarget::aegisManifestFileName()
void Qt4HarmattanTarget::handleTargetAddedSpecial()
{
AbstractDebBasedQt4MaemoTarget::handleTargetAddedSpecial();
- QFile(debianDirPath() + QLatin1Char('/') + aegisManifestFileName()).open(QIODevice::WriteOnly);
+ QFile aegisFile(debianDirPath() + QLatin1Char('/') + aegisManifestFileName());
+ if (!aegisFile.exists())
+ aegisFile.open(QIODevice::WriteOnly);
}
void Qt4HarmattanTarget::addAdditionalControlFileFields(QByteArray &controlContents)