forked from qt-creator/qt-creator
		
	tr()-Fixes for 2.6.
- ProjectExplorer::Profile should appear as 'Target' in the UI. - Fix messagebox title capitalization - Fix Q_DECLARE_TR_FUNCTIONS to contain fully qualified class names, add where applicable to replace QCoreApplication::translate(). - Introduce message utility function for the commonly used 'No tool chain set up for this profile' message to ToolChainProfileInformation. - Introduce message utility functions related to adding files to version control to VcsManager to be shared by QmlJsEditor. - Fix typos. - Remove QObject::tr(), QCoreApplication::tr(). - Do not translate diagnostic console warnings of QmlProfiler. Change-Id: I6cee717a504796ef39f6eae58f552c5c8630adf3 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
		@@ -34,8 +34,6 @@
 | 
			
		||||
 | 
			
		||||
#include <qtsupport/qtsupportconstants.h>
 | 
			
		||||
 | 
			
		||||
#include <QCoreApplication>
 | 
			
		||||
 | 
			
		||||
using namespace Android::Internal;
 | 
			
		||||
 | 
			
		||||
AndroidQtVersion::AndroidQtVersion()
 | 
			
		||||
@@ -77,7 +75,7 @@ QString AndroidQtVersion::invalidReason() const
 | 
			
		||||
{
 | 
			
		||||
    QString tmp = BaseQtVersion::invalidReason();
 | 
			
		||||
    if (tmp.isEmpty() && qtAbis().isEmpty())
 | 
			
		||||
        return QCoreApplication::translate("QtVersion", "Failed to detect the ABI(s) used by the Qt version.");
 | 
			
		||||
        return tr("Failed to detect the ABI(s) used by the Qt version.");
 | 
			
		||||
    return tmp;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -90,7 +88,7 @@ QList<ProjectExplorer::Abi> AndroidQtVersion::detectQtAbis() const
 | 
			
		||||
 | 
			
		||||
QString AndroidQtVersion::description() const
 | 
			
		||||
{
 | 
			
		||||
    return QCoreApplication::translate("QtVersion", "Android", "Qt Version is meant for Android");
 | 
			
		||||
    return tr("Android::Internal::AndroidQtVersion", "Qt Version is meant for Android");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
Core::FeatureSet AndroidQtVersion::availableFeatures() const
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user