forked from qt-creator/qt-creator
		
	QmlJSEditor: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I899c26e028efe355d4673b55ac9718e103c7d7ec Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
		
				
					committed by
					
						
						Fawzi Mohamed
					
				
			
			
				
	
			
			
			
						parent
						
							f5064d064f
						
					
				
				
					commit
					9bf654743e
				
			@@ -217,7 +217,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
 | 
			
		||||
 | 
			
		||||
    // Insert marker for "Refactoring" menu:
 | 
			
		||||
    Core::Command *sep = contextMenu->addSeparator(globalContext);
 | 
			
		||||
    sep->action()->setObjectName(Constants::M_REFACTORING_MENU_INSERTION_POINT);
 | 
			
		||||
    sep->action()->setObjectName(QLatin1String(Constants::M_REFACTORING_MENU_INSERTION_POINT));
 | 
			
		||||
    contextMenu->addSeparator(globalContext);
 | 
			
		||||
 | 
			
		||||
    cmd = Core::ActionManager::command(TextEditor::Constants::AUTO_INDENT_SELECTION);
 | 
			
		||||
@@ -235,7 +235,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
 | 
			
		||||
    errorMessage->clear();
 | 
			
		||||
 | 
			
		||||
    Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
 | 
			
		||||
    iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(":/qmljseditor/images/qmlfile.png")), "qml");
 | 
			
		||||
    iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(":/qmljseditor/images/qmlfile.png")), QLatin1String("qml"));
 | 
			
		||||
 | 
			
		||||
    registerQuickFixes(this);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user