diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 16:43:10 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-12 16:43:10 +0100 |
| commit | 86c23468b34a30d05c8c143c14d0195c2514d3ed (patch) | |
| tree | 23f80961fc0339547ea60493c359a92e9b22e483 | |
| parent | d765ad8e3dabe44f276db9084b1d16164c4535e7 (diff) | |
| parent | 02b3729a7d15c702a9abf0faf588f262f2c6ca95 (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
| -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) { |