summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2015-03-30 17:08:05 +0200
committerEike Ziller <eike.ziller@theqtcompany.com>2015-04-01 09:34:59 +0000
commit57794c170e06c287499d56f6787fc79ec2deac26 (patch)
tree8dbadea31a02e329d70dc257ffd5d0bb5cfe8ec6 /src/app
parent8983ccc28415ce788262d1c405d727432eabcb3e (diff)
downloadqt-creator-57794c170e06c287499d56f6787fc79ec2deac26.tar.gz
Close with error if Core plugin is found but disabled
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>
Diffstat (limited to 'src/app')
-rw-r--r--src/app/main.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp
index a27986d5f0..918491f0c2 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -437,6 +437,11 @@ int main(int argc, char **argv)
displayError(msgCoreLoadFailure(reason));
return 1;
}
+ if (!coreplugin->isEffectivelyEnabled()) {
+ const QString reason = QCoreApplication::translate("Application", "Core plugin is disabled.");
+ displayError(msgCoreLoadFailure(reason));
+ return 1;
+ }
if (coreplugin->hasError()) {
displayError(msgCoreLoadFailure(coreplugin->errorString()));
return 1;