diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-10-28 10:17:44 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-28 10:17:44 +0200 |
| commit | 81cce8902ee0383c57d90792e5dd52fe5d7f0b84 (patch) | |
| tree | 0ff6facd20b82a61803b1f8d22d3576aa0016469 /src/libs/qmljs/qmljscheck.cpp | |
| parent | 2ee0b36342446dd8816480d849138496321b154a (diff) | |
| parent | 5dcf7d2ef03827329e2d57ac33ac391abf278d57 (diff) | |
| download | qt-creator-81cce8902ee0383c57d90792e5dd52fe5d7f0b84.tar.gz | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljscheck.cpp
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
src/plugins/plugins.pro
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
Diffstat (limited to 'src/libs/qmljs/qmljscheck.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 64055f881d..cb679b1c46 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -955,8 +955,7 @@ bool Check::visit(Block *ast) addMessage(WarnBlock, ast->lbraceToken); } if (!ast->statements - && (cast<UiPublicMember *>(p) - || cast<UiScriptBinding *>(p)) + && cast<UiPublicMember *>(p) && ast->lbraceToken.startLine == ast->rbraceToken.startLine) { addMessage(WarnUnintentinalEmptyBlock, locationFromRange(ast->firstSourceLocation(), ast->lastSourceLocation())); } |