diff options
| -rw-r--r-- | src/libs/cplusplus/TypeOfExpression.cpp | 2 | ||||
| -rw-r--r-- | src/libs/extensionsystem/pluginmanager.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/cplusplus/TypeOfExpression.cpp b/src/libs/cplusplus/TypeOfExpression.cpp index fe9a664d18..032443339c 100644 --- a/src/libs/cplusplus/TypeOfExpression.cpp +++ b/src/libs/cplusplus/TypeOfExpression.cpp @@ -145,5 +145,5 @@ QString TypeOfExpression::preprocessedExpression(const QString &expression, Preprocessor preproc(0, env); QByteArray preprocessedCode; preproc("<expression>", code, &preprocessedCode); - return QString::fromUtf8(preprocessedCode); + return QString::fromUtf8(preprocessedCode.constData(), preprocessedCode.size()); } diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index 5a1c8a00e6..7f523ad277 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -459,7 +459,8 @@ bool PluginManager::runningTests() const */ QString PluginManager::testDataDirectory() const { - QString s = QString::fromLocal8Bit(qgetenv("IDETESTDIR")); + QByteArray ba = qgetenv("IDETESTDIR"); + QString s = QString::fromLocal8Bit(ba.constData(), ba.size()); if (s.isEmpty()) { s = IDE_TEST_DIR; s.append("/tests"); |