3 files changed, 3 insertions, 20 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 7e42402dd0..8e5a493bcd 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -338,19 +338,6 @@ static void getAppFlags(int argc, char **argv)
 #endif // QT_GUI_LIB
 }
 
-bool getFileSansBangLine(const QString &path, QByteArray &output)
-{
-    QFile f(path);
-    if (!f.open(QFile::ReadOnly | QFile::Text))
-        return false;
-    output = f.readAll();
-    if (output.startsWith("#!")) {//Remove first line in this case (except \n, to avoid disturbing line count)
-        output.remove(0, output.indexOf('\n'));
-        return true;
-    }
-    return false;
-}
-
 static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory)
 {
     QDir dir(directory+"/dummydata", "*.qml");
@@ -603,12 +590,7 @@ int main(int argc, char *argv[])
         QUrl url = QUrl::fromUserInput(path, QDir::currentPath(), QUrl::AssumeLocalFile);
         if (verboseMode)
             printf("qml: loading %s\n", qPrintable(url.toString()));
-        QByteArray strippedFile;
-        if (getFileSansBangLine(path, strippedFile))
-            // QQmlComponent won't resolve it for us: it doesn't know it's a valid file if we loadData
-            e.loadData(strippedFile, e.baseUrl().resolved(url));
-        else // Errors or no bang line
-            e.load(url);
+        e.load(url);
     }
 
     if (lw->earlyExit)
diff --git a/tools/qmlformat/commentastvisitor.h b/tools/qmlformat/commentastvisitor.h
index 6ebf8246ba..09bc786985 100644
--- a/tools/qmlformat/commentastvisitor.h
+++ b/tools/qmlformat/commentastvisitor.h
@@ -65,6 +65,7 @@ struct Comment
 
     QList<SourceLocation> m_srcLocations;
 
+    bool hasSheBang() const { return !m_srcLocations.isEmpty() && m_srcLocations.first().begin() == 0; }
     bool isValid() const { return !m_srcLocations.isEmpty(); }
     bool isMultiline() const { return m_text.contains("\n"); }
     bool isSyntheticMultiline() const { return m_srcLocations.size() > 1; }
diff --git a/tools/qmlformat/dumpastvisitor.cpp b/tools/qmlformat/dumpastvisitor.cpp
index 771814ffd5..723be4e445 100644
--- a/tools/qmlformat/dumpastvisitor.cpp
+++ b/tools/qmlformat/dumpastvisitor.cpp
@@ -129,7 +129,7 @@ QString DumpAstVisitor::formatComment(const Comment &comment) const
 
     if (useMultilineComment)
         result += "/*";
-    else
+    else if (!comment.hasSheBang())
         result += "//";
 
     result += comment.m_text;