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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/debugger/debuggeractions.cpp
This commit is contained in:
con
2011-02-04 11:46:30 +01:00
parent 8c65637407 d4e5890286
commit b69ab309cd
9 changed files with 108 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/qtcreator.qdoc
View File

@@ -3749,7 +3749,15 @@
For more information on the options you have, see \l{Specifying Build Settings}. For more information on the options you have, see \l{Specifying Build Settings}.
\section1 Troubleshooting Build Issues \section1 Building for Symbian
The tool chain for building applications locally on the development PC for
the \gui {Symbian Device} target is only supported on Windows.
If you develop on Linux or Mac OS, you must use the Remote Compiler
interface to a compilation service at Forum Nokia. For more information,
see \l{Building with Remote Compiler}.
\section2 Troubleshooting Build Issues
If you cannot build the application for a Symbian device, check that: If you cannot build the application for a Symbian device, check that:

12
share/qtcreator/templates/mobileapp/app.pro
View File

@@ -4,14 +4,6 @@
# dir1.source = mydir # dir1.source = mydir
DEPLOYMENTFOLDERS = # file1 dir1 DEPLOYMENTFOLDERS = # file1 dir1
# Avoid auto screen rotation
# ORIENTATIONLOCK #
DEFINES += ORIENTATIONLOCK
# Needs to be defined for Symbian
# NETWORKACCESS #
DEFINES += NETWORKACCESS
# TARGETUID3 # # TARGETUID3 #
symbian:TARGET.UID3 = 0xE1111234 symbian:TARGET.UID3 = 0xE1111234
@@ -22,6 +14,10 @@ symbian:TARGET.UID3 = 0xE1111234
# and 0x2002CCCF value if protected UID is given to the application # and 0x2002CCCF value if protected UID is given to the application
#symbian:DEPLOYMENT.installer_header = 0x2002CCCF #symbian:DEPLOYMENT.installer_header = 0x2002CCCF
# Allow network access on Symbian
# NETWORKACCESS #
symbian:TARGET.CAPABILITY += NetworkServices
# If your application uses the Qt Mobility libraries, uncomment # If your application uses the Qt Mobility libraries, uncomment
# the following lines and add the respective components to the # the following lines and add the respective components to the
# MOBILITY variable. # MOBILITY variable.

58
share/qtcreator/templates/mobileapp/mainwindow.cpp
View File

@@ -11,13 +11,6 @@
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#if defined(Q_OS_SYMBIAN) && defined(ORIENTATIONLOCK)
#include <eikenv.h>
#include <eikappui.h>
#include <aknenv.h>
#include <aknappui.h>
#endif // Q_OS_SYMBIAN && ORIENTATIONLOCK
MainWindow::MainWindow(QWidget *parent) MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent), ui(new Ui::MainWindow) : QMainWindow(parent), ui(new Ui::MainWindow)
{ {
@@ -31,40 +24,45 @@ MainWindow::~MainWindow()
void MainWindow::setOrientation(ScreenOrientation orientation) void MainWindow::setOrientation(ScreenOrientation orientation)
{ {
#ifdef Q_OS_SYMBIAN #if defined(Q_OS_SYMBIAN)
// If the version of Qt on the device is < 4.7.2, that attribute won't work
if (orientation != ScreenOrientationAuto) { if (orientation != ScreenOrientationAuto) {
#if defined(ORIENTATIONLOCK) const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));
const CAknAppUiBase::TAppUiOrientation uiOrientation = if (v.count() == 3 && (v.at(0).toInt() << 16 | v.at(1).toInt() << 8 | v.at(2).toInt()) < 0x040702) {
(orientation == ScreenOrientationLockPortrait) ? CAknAppUi::EAppUiOrientationPortrait qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");
: CAknAppUi::EAppUiOrientationLandscape; return;
CAknAppUi* appUi = dynamic_cast<CAknAppUi*> (CEikonEnv::Static()->AppUi()); }
TRAPD(error,
if (appUi)
appUi->SetOrientationL(uiOrientation);
);
Q_UNUSED(error)
#else // ORIENTATIONLOCK
qWarning("'ORIENTATIONLOCK' needs to be defined on Symbian when locking the orientation.");
#endif // ORIENTATIONLOCK
} }
#elif defined(Q_WS_MAEMO_5) #endif // Q_OS_SYMBIAN
Qt::WidgetAttribute attribute; Qt::WidgetAttribute attribute;
switch (orientation) { switch (orientation) {
#if QT_VERSION < 0x040702
// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
case ScreenOrientationLockPortrait: case ScreenOrientationLockPortrait:
attribute = Qt::WA_Maemo5PortraitOrientation; attribute = static_cast<Qt::WidgetAttribute>(128);
break; break;
case ScreenOrientationLockLandscape: case ScreenOrientationLockLandscape:
attribute = Qt::WA_Maemo5LandscapeOrientation; attribute = static_cast<Qt::WidgetAttribute>(129);
break; break;
case ScreenOrientationAuto:
default: default:
attribute = Qt::WA_Maemo5AutoOrientation; case ScreenOrientationAuto:
attribute = static_cast<Qt::WidgetAttribute>(130);
break; break;
} #else // QT_VERSION < 0x040702
case ScreenOrientationLockPortrait:
attribute = Qt::WA_LockPortraitOrientation;
break;
case ScreenOrientationLockLandscape:
attribute = Qt::WA_LockLandscapeOrientation;
break;
default:
case ScreenOrientationAuto:
attribute = Qt::WA_AutoOrientation;
break;
#endif // QT_VERSION < 0x040702
};
setAttribute(attribute, true); setAttribute(attribute, true);
#else // Q_OS_SYMBIAN
Q_UNUSED(orientation);
#endif // Q_OS_SYMBIAN
} }
void MainWindow::showExpanded() void MainWindow::showExpanded()

12
share/qtcreator/templates/qmlapp/app.pro
View File

@@ -9,14 +9,6 @@ DEPLOYMENTFOLDERS = folder_01
# QML_IMPORT_PATH # # QML_IMPORT_PATH #
QML_IMPORT_PATH = QML_IMPORT_PATH =
# Avoid auto screen rotation
# ORIENTATIONLOCK #
DEFINES += ORIENTATIONLOCK
# Needs to be defined for Symbian
# NETWORKACCESS #
DEFINES += NETWORKACCESS
# TARGETUID3 # # TARGETUID3 #
symbian:TARGET.UID3 = 0xE1111234 symbian:TARGET.UID3 = 0xE1111234
@@ -27,6 +19,10 @@ symbian:TARGET.UID3 = 0xE1111234
# 0x2002CCCF value if protected UID is given to the application # 0x2002CCCF value if protected UID is given to the application
#symbian:DEPLOYMENT.installer_header = 0x2002CCCF #symbian:DEPLOYMENT.installer_header = 0x2002CCCF
# Allow network access on Symbian
# NETWORKACCESS #
symbian:TARGET.CAPABILITY += NetworkServices
# Define QMLJSDEBUGGER to allow debugging of QML in debug builds # Define QMLJSDEBUGGER to allow debugging of QML in debug builds
# (This might significantly increase build time) # (This might significantly increase build time)
# DEFINES += QMLJSDEBUGGER # DEFINES += QMLJSDEBUGGER

58
share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
View File

@@ -27,13 +27,6 @@
#include <qdeclarativeviewobserver.h> #include <qdeclarativeviewobserver.h>
#endif #endif
#if defined(Q_OS_SYMBIAN) && defined(ORIENTATIONLOCK)
#include <eikenv.h>
#include <eikappui.h>
#include <aknenv.h>
#include <aknappui.h>
#endif // Q_OS_SYMBIAN && ORIENTATIONLOCK
#if defined(QMLJSDEBUGGER) #if defined(QMLJSDEBUGGER)
// Enable debugging before any QDeclarativeEngine is created // Enable debugging before any QDeclarativeEngine is created
@@ -108,40 +101,45 @@ void QmlApplicationViewer::addImportPath(const QString &path)
void QmlApplicationViewer::setOrientation(ScreenOrientation orientation) void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
{ {
#ifdef Q_OS_SYMBIAN #if defined(Q_OS_SYMBIAN)
// If the version of Qt on the device is < 4.7.2, that attribute won't work
if (orientation != ScreenOrientationAuto) { if (orientation != ScreenOrientationAuto) {
#if defined(ORIENTATIONLOCK) const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));
const CAknAppUiBase::TAppUiOrientation uiOrientation = if (v.count() == 3 && (v.at(0).toInt() << 16 | v.at(1).toInt() << 8 | v.at(2).toInt()) < 0x040702) {
(orientation == ScreenOrientationLockPortrait) ? CAknAppUi::EAppUiOrientationPortrait qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");
: CAknAppUi::EAppUiOrientationLandscape; return;
CAknAppUi* appUi = dynamic_cast<CAknAppUi*> (CEikonEnv::Static()->AppUi()); }
TRAPD(error,
if (appUi)
appUi->SetOrientationL(uiOrientation);
);
Q_UNUSED(error)
#else // ORIENTATIONLOCK
qWarning("'ORIENTATIONLOCK' needs to be defined on Symbian when locking the orientation.");
#endif // ORIENTATIONLOCK
} }
#elif defined(Q_WS_MAEMO_5) #endif // Q_OS_SYMBIAN
Qt::WidgetAttribute attribute; Qt::WidgetAttribute attribute;
switch (orientation) { switch (orientation) {
#if QT_VERSION < 0x040702
// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
case ScreenOrientationLockPortrait: case ScreenOrientationLockPortrait:
attribute = Qt::WA_Maemo5PortraitOrientation; attribute = static_cast<Qt::WidgetAttribute>(128);
break; break;
case ScreenOrientationLockLandscape: case ScreenOrientationLockLandscape:
attribute = Qt::WA_Maemo5LandscapeOrientation; attribute = static_cast<Qt::WidgetAttribute>(129);
break; break;
case ScreenOrientationAuto:
default: default:
attribute = Qt::WA_Maemo5AutoOrientation; case ScreenOrientationAuto:
attribute = static_cast<Qt::WidgetAttribute>(130);
break; break;
} #else // QT_VERSION < 0x040702
case ScreenOrientationLockPortrait:
attribute = Qt::WA_LockPortraitOrientation;
break;
case ScreenOrientationLockLandscape:
attribute = Qt::WA_LockLandscapeOrientation;
break;
default:
case ScreenOrientationAuto:
attribute = Qt::WA_AutoOrientation;
break;
#endif // QT_VERSION < 0x040702
};
setAttribute(attribute, true); setAttribute(attribute, true);
#else // Q_OS_SYMBIAN
Q_UNUSED(orientation);
#endif // Q_OS_SYMBIAN
} }
void QmlApplicationViewer::showExpanded() void QmlApplicationViewer::showExpanded()

2
share/qtcreator/templates/shared/deployment.pri
View File

@@ -21,8 +21,6 @@ MAINPROFILEPWD = $$PWD
symbian { symbian {
isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -lcone
contains(DEFINES, NETWORKACCESS):TARGET.CAPABILITY += NetworkServices
} else:win32 { } else:win32 {
copyCommand = copyCommand =
for(deploymentfolder, DEPLOYMENTFOLDERS) { for(deploymentfolder, DEPLOYMENTFOLDERS) {

60
share/qtcreator/translations/qtcreator_de.ts
View File

@@ -43,7 +43,7 @@
</message> </message>
<message> <message>
<source>Attach to process ID:</source> <source>Attach to process ID:</source>
<translation>Prozess-Id:</translation> <translation>Prozess-ID:</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -702,7 +702,7 @@
</message> </message>
<message> <message>
<source>Could not find commits of id &apos;%1&apos; on %2.</source> <source>Could not find commits of id &apos;%1&apos; on %2.</source>
<translation>Es konnten keine Abgaben des Datums %2 mit der Id &apos;%1&apos; gefunden werden.</translation> <translation>Es konnten keine Abgaben des Datums %2 mit der ID &apos;%1&apos; gefunden werden.</translation>
</message> </message>
<message> <message>
<source>No cvs executable specified!</source> <source>No cvs executable specified!</source>
@@ -771,7 +771,7 @@
</message> </message>
<message> <message>
<source>Describe all files matching commit id</source> <source>Describe all files matching commit id</source>
<translation>Alle zur Commit-Id gehörenden Dateien beschreiben:</translation> <translation>Alle zur Commit-ID gehörenden Dateien beschreiben:</translation>
</message> </message>
<message> <message>
<source>Timeout:</source> <source>Timeout:</source>
@@ -795,7 +795,7 @@
</message> </message>
<message> <message>
<source>When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit ID). Otherwise, only the respective file will be displayed.</source> <source>When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit ID). Otherwise, only the respective file will be displayed.</source>
<translation>Wenn die Option aktiviert ist, werden beim Klick auf die Revisionsnummer in der Annotationsansicht alle Dateien angezeigt, die zu einer Abgabe gehören (mittels Commit-Id bestimmt). Ansonsten wird nur die betreffende Datei angezeigt.</translation> <translation>Wenn die Option aktiviert ist, werden beim Klick auf die Revisionsnummer in der Annotationsansicht alle Dateien angezeigt, die zu einer Abgabe gehören (mittels Commit-ID bestimmt). Ansonsten wird nur die betreffende Datei angezeigt.</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -2008,6 +2008,10 @@ Sollen sie überschrieben werden?</translation>
<source>Yes, I know what I am doing.</source> <source>Yes, I know what I am doing.</source>
<translation>Ja, Ich bin mir dessen bewusst.</translation> <translation>Ja, Ich bin mir dessen bewusst.</translation>
</message> </message>
<message>
<source>&amp;Refactor</source>
<translation>&amp;Refactoring</translation>
</message>
<message> <message>
<source>Unused variable</source> <source>Unused variable</source>
<translation>Unbenutzte Variable</translation> <translation>Unbenutzte Variable</translation>
@@ -2303,7 +2307,7 @@ Sollen sie überschrieben werden?</translation>
<name>Debugger::Internal::AttachExternalDialog</name> <name>Debugger::Internal::AttachExternalDialog</name>
<message> <message>
<source>Process ID</source> <source>Process ID</source>
<translation>Prozess-Id</translation> <translation>Prozess-ID</translation>
</message> </message>
<message> <message>
<source>Name</source> <source>Name</source>
@@ -3595,11 +3599,11 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<name>Debugger::Internal::ThreadsHandler</name> <name>Debugger::Internal::ThreadsHandler</name>
<message> <message>
<source>Thread&amp;nbsp;id:</source> <source>Thread&amp;nbsp;id:</source>
<translation>Thread-Id:</translation> <translation>Thread-ID:</translation>
</message> </message>
<message> <message>
<source>Target&amp;nbsp;id:</source> <source>Target&amp;nbsp;id:</source>
<translation>Ziel-Id:</translation> <translation>Ziel-ID:</translation>
</message> </message>
<message> <message>
<source>Name:</source> <source>Name:</source>
@@ -3647,7 +3651,7 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
</message> </message>
<message> <message>
<source>Thread ID</source> <source>Thread ID</source>
<translation>Thread-Id</translation> <translation>Thread-ID</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -3677,7 +3681,7 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
</message> </message>
<message> <message>
<source>Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4.</source> <source>Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4.</source>
<translation>Der Prozess wurde gestartet, PID: 0x%1, Thread-Id: 0x%2, Code-Segment: 0x%3, Datensegment: 0x%4.</translation> <translation>Der Prozess wurde gestartet, PID: 0x%1, Thread-ID: 0x%2, Code-Segment: 0x%3, Datensegment: 0x%4.</translation>
</message> </message>
<message> <message>
<source>The reported code segment address (0x%1) might be invalid. Symbol resolution or setting breakoints may not work.</source> <source>The reported code segment address (0x%1) might be invalid. Symbol resolution or setting breakoints may not work.</source>
@@ -9804,7 +9808,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung &apos;TRK&apos;
</message> </message>
<message> <message>
<source>Application running with pid %1.</source> <source>Application running with pid %1.</source>
<translation>Die Anwendung läuft mit der Prozess-Id: %1.</translation> <translation>Die Anwendung läuft mit der Prozess-ID: %1.</translation>
</message> </message>
<message> <message>
<source>Finished.</source> <source>Finished.</source>
@@ -12770,7 +12774,7 @@ p, li { white-space: pre-wrap; }
<name>Qt4ProjectManager::Internal::S60Devices::Device</name> <name>Qt4ProjectManager::Internal::S60Devices::Device</name>
<message> <message>
<source>Id:</source> <source>Id:</source>
<translation>Id:</translation> <translation>ID:</translation>
</message> </message>
<message> <message>
<source>Name:</source> <source>Name:</source>
@@ -14801,11 +14805,11 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<name>QmlDesigner::NavigatorTreeModel</name> <name>QmlDesigner::NavigatorTreeModel</name>
<message> <message>
<source>Invalid Id</source> <source>Invalid Id</source>
<translation>Ungültige Id</translation> <translation>Ungültige ID</translation>
</message> </message>
<message> <message>
<source>%1 is an invalid id</source> <source>%1 is an invalid id</source>
<translation>%1 ist keine gültige Id</translation> <translation>%1 ist keine gültige ID</translation>
</message> </message>
<message> <message>
<source>Warning</source> <source>Warning</source>
@@ -15094,7 +15098,7 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
</message> </message>
<message> <message>
<source>New id:</source> <source>New id:</source>
<translation>Neue Id:</translation> <translation>Neue ID:</translation>
</message> </message>
<message> <message>
<source>Unused variable</source> <source>Unused variable</source>
@@ -15102,11 +15106,11 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
</message> </message>
<message> <message>
<source>Refactoring</source> <source>Refactoring</source>
<translation>Refaktorisierung</translation> <translation>Refactoring</translation>
</message> </message>
<message> <message>
<source>Rename id &apos;%1&apos;...</source> <source>Rename id &apos;%1&apos;...</source>
<translation>Id &apos;%1&apos; Umbenennen</translation> <translation>ID &apos;%1&apos; umbenennen</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -15596,15 +15600,15 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
</message> </message>
<message> <message>
<source>expected id</source> <source>expected id</source>
<translation>Id erwartet</translation> <translation>ID erwartet</translation>
</message> </message>
<message> <message>
<source>using string literals for ids is discouraged</source> <source>using string literals for ids is discouraged</source>
<translation>Von der Verwendung von Zeichenketten-Literalen als Ids wird abgeraten</translation> <translation>Von der Verwendung von Zeichenketten-Literalen als IDs wird abgeraten</translation>
</message> </message>
<message> <message>
<source>ids must be lower case</source> <source>ids must be lower case</source>
<translation>Ids müssen mit einem Kleinbuchstaben beginnen</translation> <translation>IDs müssen mit einem Kleinbuchstaben beginnen</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -16866,7 +16870,7 @@ Haben Sie Qemu gestartet?</translation>
</message> </message>
<message> <message>
<source>Id</source> <source>Id</source>
<translation>Id</translation> <translation>ID</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -17988,11 +17992,11 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<name>QmlDesigner::PropertyEditor</name> <name>QmlDesigner::PropertyEditor</name>
<message> <message>
<source>Invalid Id</source> <source>Invalid Id</source>
<translation>Ungültige Id</translation> <translation>Ungültige ID</translation>
</message> </message>
<message> <message>
<source>%1 is an invalid id</source> <source>%1 is an invalid id</source>
<translation>%1 ist keine gültige Id</translation> <translation>%1 ist keine gültige ID</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -18023,16 +18027,16 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<source>Only alphanumeric characters and underscore allowed. <source>Only alphanumeric characters and underscore allowed.
Ids must begin with a lowercase letter.</source> Ids must begin with a lowercase letter.</source>
<translation>Es sind nur alphanumerische Zeichen und Unterstriche zulässig. <translation>Es sind nur alphanumerische Zeichen und Unterstriche zulässig.
Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation> IDs müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
</message> </message>
<message> <message>
<source>Ids have to be unique.</source> <source>Ids have to be unique.</source>
<translation>Ids müssen eindeutig sein.</translation> <translation>IDs müssen eindeutig sein.</translation>
</message> </message>
<message> <message>
<source>Invalid Id: %1 <source>Invalid Id: %1
%2</source> %2</source>
<translation>Ungültige Id: %1 <translation>Ungültige ID: %1
%2</translation> %2</translation>
</message> </message>
</context> </context>
@@ -18047,7 +18051,7 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<name>QmlDesigner::QmlModelView</name> <name>QmlDesigner::QmlModelView</name>
<message> <message>
<source>Invalid Id</source> <source>Invalid Id</source>
<translation>Ungültige Id</translation> <translation>Ungültige ID</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -19329,7 +19333,7 @@ Server: %2.</translation>
</message> </message>
<message> <message>
<source>Cannot attach to PID 0</source> <source>Cannot attach to PID 0</source>
<translation>Der Debugger kann nicht an die Prozess-Id 0 angehängt werden</translation> <translation>Der Debugger kann nicht an die Prozess-ID 0 angehängt werden</translation>
</message> </message>
<message> <message>
<source>Process %1</source> <source>Process %1</source>
@@ -19450,7 +19454,7 @@ Das Setzen von Haltepunkten nach Dateinamen und Zeilennummern könnte nicht funk
<name>Debugger::Internal::TcfTrkGdbAdapter</name> <name>Debugger::Internal::TcfTrkGdbAdapter</name>
<message> <message>
<source>Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4.</source> <source>Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4.</source>
<translation>Der Prozess wurde gestartet, PID: 0x%1, Thread-Id: 0x%2, Code-Segment: 0x%3, Datensegment: 0x%4.</translation> <translation>Der Prozess wurde gestartet, PID: 0x%1, Thread-ID: 0x%2, Code-Segment: 0x%3, Datensegment: 0x%4.</translation>
</message> </message>
<message> <message>
<source>The reported code segment address (0x%1) might be invalid. Symbol resolution or setting breakoints may not work.</source> <source>The reported code segment address (0x%1) might be invalid. Symbol resolution or setting breakoints may not work.</source>

6
src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
View File

@@ -62,7 +62,8 @@ const QString AbstractMobileApp::FileStubVersion(QLatin1String("version"));
const int AbstractMobileApp::StubVersion = 3; const int AbstractMobileApp::StubVersion = 3;
AbstractMobileApp::AbstractMobileApp() AbstractMobileApp::AbstractMobileApp()
: m_orientation(ScreenOrientationAuto), m_networkEnabled(false) : m_orientation(ScreenOrientationAuto)
, m_networkEnabled(true)
{ {
} }
@@ -253,9 +254,6 @@ QByteArray AbstractMobileApp::generateProFile(QString *errorMessage) const
while (!(line = in.readLine()).isNull()) { while (!(line = in.readLine()).isNull()) {
if (line.contains(QLatin1String("# TARGETUID3"))) { if (line.contains(QLatin1String("# TARGETUID3"))) {
valueOnNextLine = symbianTargetUid(); valueOnNextLine = symbianTargetUid();
} else if (line.contains(QLatin1String("# ORIENTATIONLOCK"))
&& orientation() == ScreenOrientationAuto) {
uncommentNextLine = true;
} else if (line.contains(QLatin1String("# NETWORKACCESS")) } else if (line.contains(QLatin1String("# NETWORKACCESS"))
&& !networkEnabled()) { && !networkEnabled()) {
uncommentNextLine = true; uncommentNextLine = true;

3
src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizard.cpp
View File

@@ -145,8 +145,7 @@ void QmlStandaloneAppWizard::prepareGenerateFiles(const QWizard *w,
Q_UNUSED(errorMessage) Q_UNUSED(errorMessage)
const QmlStandaloneAppWizardDialog *wizard = qobject_cast<const QmlStandaloneAppWizardDialog*>(w); const QmlStandaloneAppWizardDialog *wizard = qobject_cast<const QmlStandaloneAppWizardDialog*>(w);
const QString mainQmlFile = wizard->m_qmlSourcesPage->mainQmlFile(); const QString mainQmlFile = wizard->m_qmlSourcesPage->mainQmlFile();
if (!mainQmlFile.isEmpty()) m_d->standaloneApp->setMainQmlFile(mainQmlFile);
m_d->standaloneApp->setMainQmlFile(mainQmlFile);
} }
bool QmlStandaloneAppWizard::postGenerateFilesInternal(const Core::GeneratedFiles &l, bool QmlStandaloneAppWizard::postGenerateFilesInternal(const Core::GeneratedFiles &l,