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

Close with error if Core plugin is found but disabled

Browse Source 
Change-Id: I9ec0f970da99ce7cdf171684b41fafa4b38a2629
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-03-30 17:08:05 +02:00
parent 8983ccc284
commit 57794c170e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/main.cpp
View File

@@ -437,6 +437,11 @@ int main(int argc, char **argv)
displayError(msgCoreLoadFailure(reason)); displayError(msgCoreLoadFailure(reason));
return 1; return 1;
} }
if (!coreplugin->isEffectivelyEnabled()) {
const QString reason = QCoreApplication::translate("Application", "Core plugin is disabled.");
displayError(msgCoreLoadFailure(reason));
return 1;
}
if (coreplugin->hasError()) { if (coreplugin->hasError()) {
displayError(msgCoreLoadFailure(coreplugin->errorString())); displayError(msgCoreLoadFailure(coreplugin->errorString()));
return 1; return 1;