diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-06-12 16:17:40 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-06-12 17:29:59 +0200 |
| commit | 7d37a86f5eed49fe704bf4e71312289617949291 (patch) | |
| tree | d73008ba55e198ac4c4afdb242f22d67baf5f358 | |
| parent | 8ad6eb3c251561e817eb6b18a496fea07f4e2c31 (diff) | |
fix crash if core is not there
Change-Id: I2eaf6015c6bbc601338f94db0761ddd0016a8211
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| -rw-r--r-- | src/libs/installer/qtpatchoperation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index 997b92b77..25924811a 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -204,7 +204,7 @@ bool QtPatchOperation::performOperation() return false; } - if (!filteredQmakeOutputInstallerKey.isEmpty() && core->value(qmakeOutputInstallerKey).isEmpty()) { + if (core && !filteredQmakeOutputInstallerKey.isEmpty() && core->value(qmakeOutputInstallerKey).isEmpty()) { setError(UserDefinedError); setErrorString(tr("Could not find the needed QmakeOutputInstallerKey(%1) value on the installer " "object. The ConsumeOutput operation on the valid qmake needs to be called first.").arg( @@ -220,7 +220,7 @@ bool QtPatchOperation::performOperation() #endif QHash<QString, QByteArray> qmakeValueHash; - if (!core->value(qmakeOutputInstallerKey).isEmpty()) { + if (core && !core->value(qmakeOutputInstallerKey).isEmpty()) { qmakeValueHash = QtPatch::readQmakeOutput(core->value(qmakeOutputInstallerKey).toLatin1()); } else { if (!QFile::exists(qmakePath)) { |