feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.3'

Browse Source
This commit is contained in:
Eike Ziller
2011-09-16 10:44:32 +02:00
parent f396395056 8ba4003c13
commit d3cce3a027
12 changed files with 96 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/images/qtcreator-gs-build-example-open.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 50 KiB

6
doc/qtcreator.qdoc
View File

@@ -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"

74
doc/symbiandev.qdoc
View File

@@ -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

7
src/libs/utils/process_stub_win.c
View File

@@ -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;
}

1
src/plugins/plugins.pro
View File

@@ -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

5
src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri
View File

@@ -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
}

5
src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
View File

@@ -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
}

5
src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
View File

@@ -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
}

5
src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
View File

@@ -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
}

5
src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
View File

@@ -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
}

5
src/plugins/qmldesigner/symbianplugin/symbianplugin.pri
View File

@@ -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
}

4
src/plugins/remotelinux/qt4maemotarget.cpp
View File

@@ -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)