From 57794c170e06c287499d56f6787fc79ec2deac26 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Mon, 30 Mar 2015 17:08:05 +0200
Subject: [PATCH] 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>
---
 src/app/main.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index a27986d5f00..918491f0c25 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;