diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index da9c5cf78d4..4f6860209d6 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -519,6 +519,7 @@ Check::Check(Document::Ptr doc, const ContextPtr &context)
     disableMessage(HintDeclareVarsInOneLine);
     disableMessage(HintDeclarationsShouldBeAtStartOfFunction);
     disableMessage(HintBinaryOperatorSpacing);
+    disableMessage(HintOneStatementPerLine);
 }
 
 Check::~Check()
@@ -1165,6 +1166,32 @@ bool Check::visit(CallExpression *ast)
     return true;
 }
 
+bool Check::visit(StatementList *ast)
+{
+    SourceLocation warnStart;
+    SourceLocation warnEnd;
+    unsigned currentLine = 0;
+    for (StatementList *it = ast; it; it = it->next) {
+        if (!it->statement)
+            continue;
+        const SourceLocation itLoc = it->statement->firstSourceLocation();
+        if (itLoc.startLine != currentLine) { // first statement on a line
+            if (warnStart.isValid())
+                addMessage(HintOneStatementPerLine, locationFromRange(warnStart, warnEnd));
+            warnStart = SourceLocation();
+            currentLine = itLoc.startLine;
+        } else { // other statements on the same line
+            if (!warnStart.isValid())
+                warnStart = itLoc;
+            warnEnd = it->statement->lastSourceLocation();
+        }
+    }
+    if (warnStart.isValid())
+        addMessage(HintOneStatementPerLine, locationFromRange(warnStart, warnEnd));
+
+    return true;
+}
+
 /// When something is changed here, also change ReadingContext::lookupProperty in
 /// texttomodelmerger.cpp
 /// ### Maybe put this into the context as a helper method.
diff --git a/src/libs/qmljs/qmljscheck.h b/src/libs/qmljs/qmljscheck.h
index 3826b089d6b..49fee733f1d 100644
--- a/src/libs/qmljs/qmljscheck.h
+++ b/src/libs/qmljs/qmljscheck.h
@@ -95,6 +95,7 @@ protected:
     virtual bool visit(AST::NewExpression *ast);
     virtual bool visit(AST::NewMemberExpression *ast);
     virtual bool visit(AST::CallExpression *ast);
+    virtual bool visit(AST::StatementList *ast);
 
     virtual void endVisit(QmlJS::AST::UiObjectInitializer *);