diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-04-21 15:29:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-04-21 15:30:00 +0200 |
| commit | dae2556d2ffb3ea4982e9caf312ac95811ddbe72 (patch) | |
| tree | cc90426882671565d337ef68cdb6a67f7be9b893 /share/qtcreator/qml | |
| parent | ac86b2e8ddbd1f9874475a8ee0d5418f12eadea4 (diff) | |
| parent | 1891af4b07801e6cbab95aca77b2ef4979b46cc0 (diff) | |
| download | qt-creator-dae2556d2ffb3ea4982e9caf312ac95811ddbe72.tar.gz | |
Merge remote-tracking branch 'origin/4.3'
Change-Id: I44511e06986b7df6007be7daf7051c895a10794b
Diffstat (limited to 'share/qtcreator/qml')
5 files changed, 5 insertions, 5 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp index e53d87b9ac..249cf38432 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp +++ b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp @@ -93,7 +93,7 @@ static SharedMemory *createSharedMemory(qint32 key, int byteCount) QDataStream &operator<<(QDataStream &out, const ValuesChangedCommand &command) { - static const bool dontUseSharedMemory = !qgetenv("DESIGNER_DONT_USE_SHARED_MEMORY").isEmpty(); + static const bool dontUseSharedMemory = qEnvironmentVariableIsSet("DESIGNER_DONT_USE_SHARED_MEMORY"); if (!dontUseSharedMemory && command.valueChanges().count() > 5) { static quint32 keyCounter = 0; diff --git a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp index 04f9ea6046..77efa1af5c 100644 --- a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp +++ b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp @@ -152,7 +152,7 @@ static void writeStream(QDataStream &out, const QImage &image) QDataStream &operator<<(QDataStream &out, const ImageContainer &container) { const int extraDataSize = 20; - static const bool dontUseSharedMemory = !qgetenv("DESIGNER_DONT_USE_SHARED_MEMORY").isEmpty(); + static const bool dontUseSharedMemory = qEnvironmentVariableIsSet("DESIGNER_DONT_USE_SHARED_MEMORY"); out << container.instanceId(); out << container.keyNumber(); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp index cb75403e6d..0d29b554e6 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp @@ -136,7 +136,7 @@ int main(int argc, char *argv[]) #endif //If a style different from Desktop is set we have to use QGuiApplication - bool useGuiApplication = !qgetenv("QT_QUICK_CONTROLS_STYLE").isEmpty() + bool useGuiApplication = qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_STYLE") && qgetenv("QT_QUICK_CONTROLS_STYLE") != "Desktop"; if (useGuiApplication) { diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp index 3243db8fc0..329ac0a8a8 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp @@ -237,7 +237,7 @@ static void allSubObject(QObject *object, QObjectList &objectList) static void fixResourcePathsForObject(QObject *object) { - if (qgetenv("QMLDESIGNER_RC_PATHS").isEmpty()) + if (qEnvironmentVariableIsEmpty("QMLDESIGNER_RC_PATHS")) return; PropertyNameList propertyNameList = propertyNameListForWritableProperties(object); diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp index cbc4e54fb1..8db8c29ccb 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp @@ -139,7 +139,7 @@ QVariant fixResourcePaths(const QVariant &value) void fixResourcePathsForObject(QObject *object) { - if (qgetenv("QMLDESIGNER_RC_PATHS").isEmpty()) + if (qEnvironmentVariableIsEmpty("QMLDESIGNER_RC_PATHS")) return; PropertyNameList propertyNameList = propertyNameListForWritableProperties(object); |