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

tr()-fixes for 2.6.

Browse Source 
- Fix typos and various capitalization errors.
- Fix wrong placeholders.
- Remove QCoreApplication::tr().
- Fix androidpackagecreationwidget.ui, remove translation
  from combo and clean up some HTML markup.

Change-Id: I51bcdad90c770c0f861a9d17e92b9c9222c6e8bf
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-08-01 15:25:05 +02:00
parent fa91da2d41
commit ee8e1122ba
11 changed files with 170 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidconfigurations.cpp
View File

@@ -438,9 +438,9 @@ bool AndroidConfigurations::createAVD(int minApiLevel) const
QStringListModel model(sdkTargets(minApiLevel)); QStringListModel model(sdkTargets(minApiLevel));
avdDialog.targetComboBox->setModel(&model); avdDialog.targetComboBox->setModel(&model);
if (!model.rowCount()) { if (!model.rowCount()) {
QMessageBox::critical(0, tr("Create AVD Error"), QMessageBox::critical(0, tr("Error Creating AVD"),
tr("Cannot create a new AVD, not enough android SDKs available\n" tr("Cannot create a new AVD, no sufficiently recent Android SDK available.\n"
"Please install one SDK with api version >=%1"). "Please install an SDK of at least API version %1.").
arg(minApiLevel)); arg(minApiLevel));
return false; return false;
} }

8
src/plugins/android/androiddeploystep.cpp
View File

@@ -250,12 +250,12 @@ bool AndroidDeployStep::deployPackage()
SLOT(handleBuildError())); SLOT(handleBuildError()));
if (m_runDeployAction == DeployLocal) { if (m_runDeployAction == DeployLocal) {
writeOutput(tr("Clean old Qt libs")); writeOutput(tr("Clean old Qt libraries"));
runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(), runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(),
QStringList() << QLatin1String("-s") << m_deviceSerialNumber QStringList() << QLatin1String("-s") << m_deviceSerialNumber
<< QLatin1String("shell") << QLatin1String("rm") << QLatin1String("-r") << QLatin1String("/data/local/qt")); << QLatin1String("shell") << QLatin1String("rm") << QLatin1String("-r") << QLatin1String("/data/local/qt"));
writeOutput(tr("Deploy Qt libs ... this may take some time, please wait")); writeOutput(tr("Deploy Qt libraries ... this may take some time, please wait"));
const QString tempPath = QDir::tempPath() + QLatin1String("/android_qt_libs_") + m_packageName; const QString tempPath = QDir::tempPath() + QLatin1String("/android_qt_libs_") + m_packageName;
AndroidPackageCreationStep::removeDirectory(tempPath); AndroidPackageCreationStep::removeDirectory(tempPath);
QStringList stripFiles; QStringList stripFiles;
@@ -279,7 +279,7 @@ bool AndroidDeployStep::deployPackage()
if (!runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(), if (!runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(),
QStringList() << QLatin1String("-s") << m_deviceSerialNumber QStringList() << QLatin1String("-s") << m_deviceSerialNumber
<< QLatin1String("install") << QLatin1String("-r ") << m_runQASIPackagePath)) { << QLatin1String("install") << QLatin1String("-r ") << m_runQASIPackagePath)) {
raiseError(tr("Qt Android smart installer instalation failed")); raiseError(tr("Qt Android smart installer installation failed"));
disconnect(deployProc, 0, this, 0); disconnect(deployProc, 0, this, 0);
deployProc->deleteLater(); deployProc->deleteLater();
return false; return false;
@@ -299,7 +299,7 @@ bool AndroidDeployStep::deployPackage()
if (!runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(), if (!runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(),
QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("install") << package)) { QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("install") << package)) {
raiseError(tr("Package instalation failed")); raiseError(tr("Package installation failed"));
disconnect(deployProc, 0, this, 0); disconnect(deployProc, 0, this, 0);
deployProc->deleteLater(); deployProc->deleteLater();
return false; return false;

16
src/plugins/android/androiddeploystepwidget.ui
View File

@@ -23,10 +23,10 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QRadioButton" name="devicesQtLibs"> <widget class="QRadioButton" name="devicesQtLibs">
<property name="toolTip"> <property name="toolTip">
<string>Use devices qt libs</string> <string>Use Qt libraries from device</string>
</property> </property>
<property name="text"> <property name="text">
<string>Use device's Qt libs</string> <string>Use Qt libraries from device</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
@@ -38,21 +38,21 @@
<item> <item>
<widget class="QRadioButton" name="deployQtLibs"> <widget class="QRadioButton" name="deployQtLibs">
<property name="toolTip"> <property name="toolTip">
<string>Push local qt libs to device. <string>Push local Qt libraries to device.
You must have Qt libs compiled for that platform</string> You must have Qt libraries compiled for that platform</string>
</property> </property>
<property name="text"> <property name="text">
<string>Deploy local Qt libs</string> <string>Deploy local Qt libraries</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="useLocalQtLibs"> <widget class="QCheckBox" name="useLocalQtLibs">
<property name="toolTip"> <property name="toolTip">
<string>Check this option to force the application to use local qt libs instead of system libs.</string> <string>Check this option to force the application to use local Qt libraries instead of system libraries.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Use local Qt libs</string> <string>Use local Qt libraries</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -70,7 +70,7 @@ You must have Qt libs compiled for that platform</string>
<item> <item>
<widget class="QRadioButton" name="installQASI"> <widget class="QRadioButton" name="installQASI">
<property name="toolTip"> <property name="toolTip">
<string>Choose and install Ministro system wide qt shared libraries. <string>Choose and install Ministro system wide Qt shared libraries.
This option is useful when you want to try your application on devices which don't have Android Market (e.g. Android Emulator).</string> This option is useful when you want to try your application on devices which don't have Android Market (e.g. Android Emulator).</string>
</property> </property>
<property name="text"> <property name="text">

24
src/plugins/android/androidpackagecreationstep.cpp
View File

@@ -142,7 +142,7 @@ bool AndroidPackageCreationStep::init()
{ {
const Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration()); const Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
if (!bc) { if (!bc) {
raiseError(tr("Cannot create android package: current build configuration is not Qt4.")); raiseError(tr("Cannot create Android package: current build configuration is not Qt 4."));
return false; return false;
} }
Qt4Project *project = static_cast<Qt4Project *>(target()->project()); Qt4Project *project = static_cast<Qt4Project *>(target()->project());
@@ -188,15 +188,24 @@ BuildStepConfigWidget *AndroidPackageCreationStep::createConfigWidget()
return new AndroidPackageCreationWidget(this); return new AndroidPackageCreationWidget(this);
} }
static inline QString msgCannotFindElfInformation()
{
return AndroidPackageCreationStep::tr("Cannot find ELF information");
}
static inline QString msgCannotFindExecutable(const QString &appPath)
{
return AndroidPackageCreationStep::tr("Cannot find '%1'.\n"
"Please make sure your application is "
"built successfully and is selected in Application tab ('Run option').").arg(appPath);
}
void AndroidPackageCreationStep::checkRequiredLibraries() void AndroidPackageCreationStep::checkRequiredLibraries()
{ {
QProcess readelfProc; QProcess readelfProc;
QString appPath = AndroidManager::targetApplicationPath(target()); QString appPath = AndroidManager::targetApplicationPath(target());
if (!QFile::exists(appPath)) { if (!QFile::exists(appPath)) {
raiseError(tr("Cannot find read elf information"), raiseError(msgCannotFindElfInformation(), msgCannotFindExecutable(appPath));
tr("Cannot find '%1'.\n"
"Please make sure your application is "
"built successfully and is selected in Application tab ('Run option') ").arg(appPath));
return; return;
} }
readelfProc.start(AndroidConfigurations::instance().readelfPath(target()->activeRunConfiguration()->abi().architecture()).toString(), readelfProc.start(AndroidConfigurations::instance().readelfPath(target()->activeRunConfiguration()->abi().architecture()).toString(),
@@ -244,10 +253,7 @@ void AndroidPackageCreationStep::checkRequiredLibrariesForRun()
{ {
QProcess readelfProc; QProcess readelfProc;
if (!m_appPath.toFileInfo().exists()) { if (!m_appPath.toFileInfo().exists()) {
raiseError(tr("Can't find read elf information"), raiseError(msgCannotFindElfInformation(), msgCannotFindExecutable(m_appPath.toUserOutput()));
tr("Can't find '%1'.\n"
"Please make sure your application is "
"built successfully and is selected in Application tab ('Run option') ").arg(m_appPath.toUserOutput()));
return; return;
} }
readelfProc.start(m_readElf.toString(), QStringList() << QLatin1String("-d") << QLatin1String("-W") << m_appPath.toUserOutput()); readelfProc.start(m_readElf.toString(), QStringList() << QLatin1String("-d") << QLatin1String("-W") << m_appPath.toUserOutput());

299
src/plugins/android/androidpackagecreationwidget.ui
View File

@@ -36,14 +36,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="editDebianFileLabel_4"> <widget class="QLabel" name="editDebianFileLabel_4">
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;b&gt;Android target SDK:&lt;/b&gt;</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Android target SDK:&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -53,14 +46,7 @@ p, li { white-space: pre-wrap; }
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="editDebianFileLabel_2"> <widget class="QLabel" name="editDebianFileLabel_2">
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;b&gt;Package name:&lt;/b&gt;</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;table style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Package name:&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -99,14 +85,7 @@ p, li { white-space: pre-wrap; }
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;b&gt;Version code:&lt;/b&gt;</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:600; font-style:normal;&quot;&gt;
&lt;table style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Version code:&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -141,14 +120,7 @@ p, li { white-space: pre-wrap; }
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;b&gt;Version name:&lt;/b&gt;</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:600; font-style:normal;&quot;&gt;
&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Version name:&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -169,14 +141,7 @@ p, li { white-space: pre-wrap; }
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="editDebianFileLabel_3"> <widget class="QLabel" name="editDebianFileLabel_3">
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;b&gt;Application name:&lt;/b&gt;</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Application name:&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -186,14 +151,7 @@ p, li { white-space: pre-wrap; }
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="editDebianFileLabel_5"> <widget class="QLabel" name="editDebianFileLabel_5">
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;b&gt;Run:&lt;/b&gt;</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Run:&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::AutoText</enum> <enum>Qt::AutoText</enum>
@@ -212,14 +170,7 @@ p, li { white-space: pre-wrap; }
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;b&gt;Application icon:&lt;/b&gt;</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;table style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Application icon:&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -425,592 +376,592 @@ p, li { white-space: pre-wrap; }
</property> </property>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.ACCESS_CHECKIN_PROPERTIES</string> <string notr="true">android.permission.ACCESS_CHECKIN_PROPERTIES</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.ACCESS_COARSE_LOCATION</string> <string notr="true">android.permission.ACCESS_COARSE_LOCATION</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.ACCESS_FINE_LOCATION</string> <string notr="true">android.permission.ACCESS_FINE_LOCATION</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.ACCESS_LOCATION_EXTRA_COMMANDS</string> <string notr="true">android.permission.ACCESS_LOCATION_EXTRA_COMMANDS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.ACCESS_MOCK_LOCATION</string> <string notr="true">android.permission.ACCESS_MOCK_LOCATION</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.ACCESS_NETWORK_STATE</string> <string notr="true">android.permission.ACCESS_NETWORK_STATE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.ACCESS_SURFACE_FLINGER</string> <string notr="true">android.permission.ACCESS_SURFACE_FLINGER</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.ACCESS_WIFI_STATE</string> <string notr="true">android.permission.ACCESS_WIFI_STATE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.ACCOUNT_MANAGER</string> <string notr="true">android.permission.ACCOUNT_MANAGER</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.AUTHENTICATE_ACCOUNTS</string> <string notr="true">android.permission.AUTHENTICATE_ACCOUNTS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BATTERY_STATS</string> <string notr="true">android.permission.BATTERY_STATS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BIND_APPWIDGET</string> <string notr="true">android.permission.BIND_APPWIDGET</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BIND_DEVICE_ADMIN</string> <string notr="true">android.permission.BIND_DEVICE_ADMIN</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BIND_INPUT_METHOD</string> <string notr="true">android.permission.BIND_INPUT_METHOD</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BIND_REMOTEVIEWS</string> <string notr="true">android.permission.BIND_REMOTEVIEWS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BIND_WALLPAPER</string> <string notr="true">android.permission.BIND_WALLPAPER</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BLUETOOTH</string> <string notr="true">android.permission.BLUETOOTH</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BLUETOOTH_ADMIN</string> <string notr="true">android.permission.BLUETOOTH_ADMIN</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BRICK</string> <string notr="true">android.permission.BRICK</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BROADCAST_PACKAGE_REMOVED</string> <string notr="true">android.permission.BROADCAST_PACKAGE_REMOVED</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BROADCAST_SMS</string> <string notr="true">android.permission.BROADCAST_SMS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BROADCAST_STICKY</string> <string notr="true">android.permission.BROADCAST_STICKY</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.BROADCAST_WAP_PUSH</string> <string notr="true">android.permission.BROADCAST_WAP_PUSH</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.CALL_PHONE</string> <string notr="true">android.permission.CALL_PHONE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.CALL_PRIVILEGED</string> <string notr="true">android.permission.CALL_PRIVILEGED</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.CAMERA</string> <string notr="true">android.permission.CAMERA</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.CHANGE_COMPONENT_ENABLED_STATE</string> <string notr="true">android.permission.CHANGE_COMPONENT_ENABLED_STATE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.CHANGE_CONFIGURATION</string> <string notr="true">android.permission.CHANGE_CONFIGURATION</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.CHANGE_NETWORK_STATE</string> <string notr="true">android.permission.CHANGE_NETWORK_STATE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.CHANGE_WIFI_MULTICAST_STATE</string> <string notr="true">android.permission.CHANGE_WIFI_MULTICAST_STATE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.CHANGE_WIFI_STATE</string> <string notr="true">android.permission.CHANGE_WIFI_STATE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.CLEAR_APP_CACHE</string> <string notr="true">android.permission.CLEAR_APP_CACHE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.CLEAR_APP_USER_DATA</string> <string notr="true">android.permission.CLEAR_APP_USER_DATA</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.CONTROL_LOCATION_UPDATES</string> <string notr="true">android.permission.CONTROL_LOCATION_UPDATES</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.DELETE_CACHE_FILES</string> <string notr="true">android.permission.DELETE_CACHE_FILES</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.DELETE_PACKAGES</string> <string notr="true">android.permission.DELETE_PACKAGES</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.DEVICE_POWER</string> <string notr="true">android.permission.DEVICE_POWER</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.DIAGNOSTIC</string> <string notr="true">android.permission.DIAGNOSTIC</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.DISABLE_KEYGUARD</string> <string notr="true">android.permission.DISABLE_KEYGUARD</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.DUMP</string> <string notr="true">android.permission.DUMP</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.EXPAND_STATUS_BAR</string> <string notr="true">android.permission.EXPAND_STATUS_BAR</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.FACTORY_TEST</string> <string notr="true">android.permission.FACTORY_TEST</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.FLASHLIGHT</string> <string notr="true">android.permission.FLASHLIGHT</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.FORCE_BACK</string> <string notr="true">android.permission.FORCE_BACK</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.GET_ACCOUNTS</string> <string notr="true">android.permission.GET_ACCOUNTS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.GET_PACKAGE_SIZE</string> <string notr="true">android.permission.GET_PACKAGE_SIZE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.GET_TASKS</string> <string notr="true">android.permission.GET_TASKS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.GLOBAL_SEARCH</string> <string notr="true">android.permission.GLOBAL_SEARCH</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.HARDWARE_TEST</string> <string notr="true">android.permission.HARDWARE_TEST</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.INJECT_EVENTS</string> <string notr="true">android.permission.INJECT_EVENTS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.INSTALL_LOCATION_PROVIDER</string> <string notr="true">android.permission.INSTALL_LOCATION_PROVIDER</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.INSTALL_PACKAGES</string> <string notr="true">android.permission.INSTALL_PACKAGES</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.INTERNAL_SYSTEM_WINDOW</string> <string notr="true">android.permission.INTERNAL_SYSTEM_WINDOW</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.INTERNET</string> <string notr="true">android.permission.INTERNET</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.KILL_BACKGROUND_PROCESSES</string> <string notr="true">android.permission.KILL_BACKGROUND_PROCESSES</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.MANAGE_ACCOUNTS</string> <string notr="true">android.permission.MANAGE_ACCOUNTS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.MANAGE_APP_TOKENS</string> <string notr="true">android.permission.MANAGE_APP_TOKENS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.MASTER_CLEAR</string> <string notr="true">android.permission.MASTER_CLEAR</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.MODIFY_AUDIO_SETTINGS</string> <string notr="true">android.permission.MODIFY_AUDIO_SETTINGS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.MODIFY_PHONE_STATE</string> <string notr="true">android.permission.MODIFY_PHONE_STATE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.MOUNT_FORMAT_FILESYSTEMS</string> <string notr="true">android.permission.MOUNT_FORMAT_FILESYSTEMS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.MOUNT_UNMOUNT_FILESYSTEMS</string> <string notr="true">android.permission.MOUNT_UNMOUNT_FILESYSTEMS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.NFC</string> <string notr="true">android.permission.NFC</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.PERSISTENT_ACTIVITY</string> <string notr="true">android.permission.PERSISTENT_ACTIVITY</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.PROCESS_OUTGOING_CALLS</string> <string notr="true">android.permission.PROCESS_OUTGOING_CALLS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.READ_CALENDAR</string> <string notr="true">android.permission.READ_CALENDAR</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.READ_CONTACTS</string> <string notr="true">android.permission.READ_CONTACTS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.READ_FRAME_BUFFER</string> <string notr="true">android.permission.READ_FRAME_BUFFER</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>com.android.browser.permission.READ_HISTORY_BOOKMARKS</string> <string notr="true">com.android.browser.permission.READ_HISTORY_BOOKMARKS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.READ_INPUT_STATE</string> <string notr="true">android.permission.READ_INPUT_STATE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.READ_LOGS</string> <string notr="true">android.permission.READ_LOGS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.READ_OWNER_DATA</string> <string notr="true">android.permission.READ_OWNER_DATA</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.READ_PHONE_STATE</string> <string notr="true">android.permission.READ_PHONE_STATE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.READ_SMS</string> <string notr="true">android.permission.READ_SMS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.READ_SYNC_SETTINGS</string> <string notr="true">android.permission.READ_SYNC_SETTINGS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.READ_SYNC_STATS</string> <string notr="true">android.permission.READ_SYNC_STATS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.REBOOT</string> <string notr="true">android.permission.REBOOT</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.RECEIVE_BOOT_COMPLETED</string> <string notr="true">android.permission.RECEIVE_BOOT_COMPLETED</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.RECEIVE_MMS</string> <string notr="true">android.permission.RECEIVE_MMS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.RECEIVE_SMS</string> <string notr="true">android.permission.RECEIVE_SMS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.RECEIVE_WAP_PUSH</string> <string notr="true">android.permission.RECEIVE_WAP_PUSH</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.RECORD_AUDIO</string> <string notr="true">android.permission.RECORD_AUDIO</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.REORDER_TASKS</string> <string notr="true">android.permission.REORDER_TASKS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.RESTART_PACKAGES</string> <string notr="true">android.permission.RESTART_PACKAGES</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SEND_SMS</string> <string notr="true">android.permission.SEND_SMS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SET_ACTIVITY_WATCHER</string> <string notr="true">android.permission.SET_ACTIVITY_WATCHER</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>com.android.alarm.permission.SET_ALARM</string> <string notr="true">com.android.alarm.permission.SET_ALARM</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SET_ALWAYS_FINISH</string> <string notr="true">android.permission.SET_ALWAYS_FINISH</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SET_ANIMATION_SCALE</string> <string notr="true">android.permission.SET_ANIMATION_SCALE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SET_DEBUG_APP</string> <string notr="true">android.permission.SET_DEBUG_APP</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SET_ORIENTATION</string> <string notr="true">android.permission.SET_ORIENTATION</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SET_PREFERRED_APPLICATIONS</string> <string notr="true">android.permission.SET_PREFERRED_APPLICATIONS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SET_PROCESS_LIMIT</string> <string notr="true">android.permission.SET_PROCESS_LIMIT</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SET_TIME</string> <string notr="true">android.permission.SET_TIME</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SET_TIME_ZONE</string> <string notr="true">android.permission.SET_TIME_ZONE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SET_WALLPAPER</string> <string notr="true">android.permission.SET_WALLPAPER</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SET_WALLPAPER_HINTS</string> <string notr="true">android.permission.SET_WALLPAPER_HINTS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SIGNAL_PERSISTENT_PROCESSES</string> <string notr="true">android.permission.SIGNAL_PERSISTENT_PROCESSES</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.STATUS_BAR</string> <string notr="true">android.permission.STATUS_BAR</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SUBSCRIBED_FEEDS_READ</string> <string notr="true">android.permission.SUBSCRIBED_FEEDS_READ</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SUBSCRIBED_FEEDS_WRITE</string> <string notr="true">android.permission.SUBSCRIBED_FEEDS_WRITE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.SYSTEM_ALERT_WINDOW</string> <string notr="true">android.permission.SYSTEM_ALERT_WINDOW</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.UPDATE_DEVICE_STATS</string> <string notr="true">android.permission.UPDATE_DEVICE_STATS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.USE_CREDENTIALS</string> <string notr="true">android.permission.USE_CREDENTIALS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.USE_SIP</string> <string notr="true">android.permission.USE_SIP</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.VIBRATE</string> <string notr="true">android.permission.VIBRATE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.WAKE_LOCK</string> <string notr="true">android.permission.WAKE_LOCK</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.WRITE_APN_SETTINGS</string> <string notr="true">android.permission.WRITE_APN_SETTINGS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.WRITE_CALENDAR</string> <string notr="true">android.permission.WRITE_CALENDAR</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.WRITE_CONTACTS</string> <string notr="true">android.permission.WRITE_CONTACTS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.WRITE_EXTERNAL_STORAGE</string> <string notr="true">android.permission.WRITE_EXTERNAL_STORAGE</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.WRITE_GSERVICES</string> <string notr="true">android.permission.WRITE_GSERVICES</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>com.android.browser.permission.WRITE_HISTORY_BOOKMARKS</string> <string notr="true">com.android.browser.permission.WRITE_HISTORY_BOOKMARKS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.WRITE_OWNER_DATA</string> <string notr="true">android.permission.WRITE_OWNER_DATA</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.WRITE_SECURE_SETTINGS</string> <string notr="true">android.permission.WRITE_SECURE_SETTINGS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.WRITE_SETTINGS</string> <string notr="true">android.permission.WRITE_SETTINGS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.WRITE_SMS</string> <string notr="true">android.permission.WRITE_SMS</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>android.permission.WRITE_SYNC_SETTINGS</string> <string notr="true">android.permission.WRITE_SYNC_SETTINGS</string>
</property> </property>
</item> </item>
</widget> </widget>

3
src/plugins/android/androidqtversion.cpp
View File

@@ -88,7 +88,8 @@ QList<ProjectExplorer::Abi> AndroidQtVersion::detectQtAbis() const
QString AndroidQtVersion::description() const QString AndroidQtVersion::description() const
{ {
return tr("Android::Internal::AndroidQtVersion", "Qt Version is meant for Android"); //: Qt Version is meant for Android
return tr("Android");
} }
Core::FeatureSet AndroidQtVersion::availableFeatures() const Core::FeatureSet AndroidQtVersion::availableFeatures() const

11
src/plugins/android/androidsettingswidget.cpp
View File

@@ -78,6 +78,7 @@ QVariant AVDModel::headerData(int section, Qt::Orientation orientation, int role
if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
switch (section) { switch (section) {
case 0: case 0:
//: AVD - Android Virtual Device
return tr("AVD Name"); return tr("AVD Name");
case 1: case 1:
return tr("AVD Target"); return tr("AVD Target");
@@ -356,7 +357,7 @@ void AndroidSettingsWidget::browseAntLocation()
void AndroidSettingsWidget::browseGdbLocation() void AndroidSettingsWidget::browseGdbLocation()
{ {
Utils::FileName gdbPath = AndroidConfigurations::instance().gdbPath(ProjectExplorer::Abi::ArmArchitecture); Utils::FileName gdbPath = AndroidConfigurations::instance().gdbPath(ProjectExplorer::Abi::ArmArchitecture);
Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select gdb executable"), gdbPath.toString())); Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select GDB Executable"), gdbPath.toString()));
if (file.isEmpty()) if (file.isEmpty())
return; return;
m_ui->GdbLocationLineEdit->setText(file.toUserOutput()); m_ui->GdbLocationLineEdit->setText(file.toUserOutput());
@@ -366,7 +367,7 @@ void AndroidSettingsWidget::browseGdbLocation()
void AndroidSettingsWidget::browseGdbserverLocation() void AndroidSettingsWidget::browseGdbserverLocation()
{ {
Utils::FileName gdbserverPath = AndroidConfigurations::instance().gdbServerPath(ProjectExplorer::Abi::ArmArchitecture); Utils::FileName gdbserverPath = AndroidConfigurations::instance().gdbServerPath(ProjectExplorer::Abi::ArmArchitecture);
Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select gdbserver android executable"), gdbserverPath.toString())); Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select GDB Server Android Executable"), gdbserverPath.toString()));
if (file.isEmpty()) if (file.isEmpty())
return; return;
m_ui->GdbserverLocationLineEdit->setText(file.toUserOutput()); m_ui->GdbserverLocationLineEdit->setText(file.toUserOutput());
@@ -376,7 +377,7 @@ void AndroidSettingsWidget::browseGdbserverLocation()
void AndroidSettingsWidget::browseGdbLocationX86() void AndroidSettingsWidget::browseGdbLocationX86()
{ {
Utils::FileName gdbPath = AndroidConfigurations::instance().gdbPath(ProjectExplorer::Abi::X86Architecture); Utils::FileName gdbPath = AndroidConfigurations::instance().gdbPath(ProjectExplorer::Abi::X86Architecture);
Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select gdb executable"), gdbPath.toString())); Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select GDB Executable"), gdbPath.toString()));
if (file.isEmpty()) if (file.isEmpty())
return; return;
m_ui->GdbLocationLineEditx86->setText(file.toUserOutput()); m_ui->GdbLocationLineEditx86->setText(file.toUserOutput());
@@ -386,7 +387,7 @@ void AndroidSettingsWidget::browseGdbLocationX86()
void AndroidSettingsWidget::browseGdbserverLocationX86() void AndroidSettingsWidget::browseGdbserverLocationX86()
{ {
Utils::FileName gdbserverPath = AndroidConfigurations::instance().gdbServerPath(ProjectExplorer::Abi::X86Architecture); Utils::FileName gdbserverPath = AndroidConfigurations::instance().gdbServerPath(ProjectExplorer::Abi::X86Architecture);
Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select gdbserver android executable"), gdbserverPath.toString())); Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select GDB Server Android Executable"), gdbserverPath.toString()));
if (file.isEmpty()) if (file.isEmpty())
return; return;
m_ui->GdbserverLocationLineEditx86->setText(file.toUserOutput()); m_ui->GdbserverLocationLineEditx86->setText(file.toUserOutput());
@@ -396,7 +397,7 @@ void AndroidSettingsWidget::browseGdbserverLocationX86()
void AndroidSettingsWidget::browseOpenJDKLocation() void AndroidSettingsWidget::browseOpenJDKLocation()
{ {
Utils::FileName openJDKPath = AndroidConfigurations::instance().openJDKPath(); Utils::FileName openJDKPath = AndroidConfigurations::instance().openJDKPath();
Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select OpenJDK path"), openJDKPath.toString())); Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select OpenJDK Path"), openJDKPath.toString()));
if (file.isEmpty()) if (file.isEmpty())
return; return;
m_ui->OpenJDKLocationLineEdit->setText(file.toUserOutput()); m_ui->OpenJDKLocationLineEdit->setText(file.toUserOutput());

2
src/plugins/android/androidtoolchain.cpp
View File

@@ -178,7 +178,7 @@ void AndroidToolChain::setQtVersionId(int id)
setTargetAbi(version->qtAbis().at(0)); setTargetAbi(version->qtAbis().at(0));
toolChainUpdated(); toolChainUpdated();
setDisplayName(AndroidToolChainFactory::tr("Android Gcc for %1").arg(version->displayName())); setDisplayName(AndroidToolChainFactory::tr("Android GCC for %1").arg(version->displayName()));
} }
int AndroidToolChain::qtVersionId() const int AndroidToolChain::qtVersionId() const

2
src/plugins/qnx/blackberrycreatepackagestep.cpp
View File

@@ -87,7 +87,7 @@ bool BlackBerryCreatePackageStep::init()
const QString packageCmd = target()->activeBuildConfiguration()->environment().searchInPath(QLatin1String(PACKAGER_CMD)); const QString packageCmd = target()->activeBuildConfiguration()->environment().searchInPath(QLatin1String(PACKAGER_CMD));
if (packageCmd.isEmpty()) { if (packageCmd.isEmpty()) {
raiseError(tr("Could not find packager command '%s' in the build environment") raiseError(tr("Could not find packager command '%1' in the build environment")
.arg(QLatin1String(PACKAGER_CMD))); .arg(QLatin1String(PACKAGER_CMD)));
return false; return false;
} }

2
src/plugins/qnx/blackberrydeviceconfigurationwidget.ui
View File

@@ -34,7 +34,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="passwordLabel"> <widget class="QLabel" name="passwordLabel">
<property name="text"> <property name="text">
<string>Device &amp;password</string> <string>Device &amp;password:</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>pwdLineEdit</cstring> <cstring>pwdLineEdit</cstring>

7
src/plugins/qnx/qnxqtversion.cpp
View File

@@ -64,7 +64,8 @@ QString QnxQtVersion::type() const
QString QnxQtVersion::description() const QString QnxQtVersion::description() const
{ {
return tr("QNX %1", "Qt Version is meant for QNX").arg(archString()); //: Qt Version is meant for QNX
return tr("QNX %1").arg(archString());
} }
Core::FeatureSet QnxQtVersion::availableFeatures() const Core::FeatureSet QnxQtVersion::availableFeatures() const
@@ -81,12 +82,12 @@ QString QnxQtVersion::platformName() const
QString QnxQtVersion::platformDisplayName() const QString QnxQtVersion::platformDisplayName() const
{ {
return QCoreApplication::tr("QNX"); return tr("QNX");
} }
QString QnxQtVersion::sdkDescription() const QString QnxQtVersion::sdkDescription() const
{ {
return QCoreApplication::tr("QNX Software Development Platform:"); return tr("QNX Software Development Platform:");
} }
QMultiMap<QString, QString> QnxQtVersion::environment() const QMultiMap<QString, QString> QnxQtVersion::environment() const