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

Merge remote-tracking branch 'origin/3.4'

Browse Source
This commit is contained in:
Eike Ziller
2015-03-19 16:00:28 +01:00
parent 318e1ca422 bc6893773f
commit aee54f9df5
94 changed files with 661 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/android/androidmanifesteditorwidget.cpp
View File

@@ -1440,5 +1440,6 @@ AndroidManifestTextEditorWidget::AndroidManifestTextEditorWidget(AndroidManifest
setTextDocument(TextEditor::TextDocumentPtr(new AndroidManifestDocument(parent)));
textDocument()->setMimeType(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE));
setupGenericHighlighter();
setMarksVisible(false);
}