diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-11 09:17:22 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-11 09:17:22 +0100 |
| commit | 02b3729a7d15c702a9abf0faf588f262f2c6ca95 (patch) | |
| tree | 17a70335cb5936fda767aac1881e4870f2dec36b | |
| parent | 6c840c70d61c3ae277b60a024a086215c743e5b3 (diff) | |
| parent | b433c4b5a761cf035ccb0bfc0982e1b80d1c07b8 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I5ac68cc3ad3926190817f0d3d5b4526e70badff6
| -rw-r--r-- | src/qml/compiler/qv4isel_p.cpp | 3 | ||||
| -rw-r--r-- | src/qml/compiler/qv4ssa.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4isel_p.cpp b/src/qml/compiler/qv4isel_p.cpp index b86837e167..644e06b59a 100644 --- a/src/qml/compiler/qv4isel_p.cpp +++ b/src/qml/compiler/qv4isel_p.cpp @@ -53,7 +53,8 @@ #include <cassert> namespace { -QTextStream qout(stderr, QIODevice::WriteOnly); +Q_GLOBAL_STATIC_WITH_ARGS(QTextStream, qout, (stderr, QIODevice::WriteOnly)); +#define qout *qout() } // anonymous namespace using namespace QQmlJS; diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp index 594c38d109..f887006b50 100644 --- a/src/qml/compiler/qv4ssa.cpp +++ b/src/qml/compiler/qv4ssa.cpp @@ -77,7 +77,8 @@ using namespace V4IR; namespace { -QTextStream qout(stdout, QIODevice::WriteOnly); +Q_GLOBAL_STATIC_WITH_ARGS(QTextStream, qout, (stderr, QIODevice::WriteOnly)); +#define qout *qout() void showMeTheCode(Function *function) { |