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

Fixed capitalization of "Qt"

Browse Source 
Change-Id: I9580c9f2a067ec30da111eb6ada61f5064a4dc5b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Robert Loehning
2012-07-30 16:41:11 +02:00
committed by Friedemann Kleint
parent 236980eaa1
commit 4300c637c8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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 libs"));
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 libs ... 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;

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

@@ -26,7 +26,7 @@
<string>Use devices qt libs</string> <string>Use devices qt libs</string>
</property> </property>
<property name="text"> <property name="text">
<string>Use devices qt libs</string> <string>Use device's Qt libs</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
@@ -42,7 +42,7 @@
You must have Qt libs compiled for that platform</string> You must have Qt libs compiled for that platform</string>
</property> </property>
<property name="text"> <property name="text">
<string>Deploy local qt libs</string> <string>Deploy local Qt libs</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -52,7 +52,7 @@ You must have Qt libs compiled for that platform</string>
<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 libs instead of system libs.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Use local qt libs</string> <string>Use local Qt libs</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -74,7 +74,7 @@ You must have Qt libs compiled for that platform</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> 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">
<string>Install Ministro system wide qt shared libraries installer</string> <string>Install Ministro system wide Qt shared libraries installer</string>
</property> </property>
</widget> </widget>
</item> </item>