diff --git a/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp b/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp index 574ff58b8aa4e62a9e9e26303b79c4869ede696b..4433669b6a62db12a594b8f11e54e5aafaa0955f 100644 --- a/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp +++ b/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp @@ -99,7 +99,7 @@ QString Html5ApplicationViewerPrivate::adjustPath(const QString &path) } #endif #endif - return path; + return QFileInfo(path).absoluteFilePath(); } void Html5ApplicationViewerPrivate::quit() @@ -130,7 +130,7 @@ Html5ApplicationViewer::~Html5ApplicationViewer() void Html5ApplicationViewer::loadFile(const QString &fileName) { - m_d->m_webView->setUrl(QUrl(Html5ApplicationViewerPrivate::adjustPath(fileName))); + m_d->m_webView->setUrl(QUrl::fromLocalFile(Html5ApplicationViewerPrivate::adjustPath(fileName))); } void Html5ApplicationViewer::loadUrl(const QUrl &url) diff --git a/src/plugins/qt4projectmanager/wizards/html5app.cpp b/src/plugins/qt4projectmanager/wizards/html5app.cpp index 95e798bbb593a2b82dd235bb4599ffe9908ff54a..6c31d8826a17f08fa533102efb57b8869d9f6672 100644 --- a/src/plugins/qt4projectmanager/wizards/html5app.cpp +++ b/src/plugins/qt4projectmanager/wizards/html5app.cpp @@ -315,7 +315,7 @@ QList<DeploymentFolder> Html5App::deploymentFolders() const return result; } -const int Html5App::StubVersion = 10; +const int Html5App::StubVersion = 11; } // namespace Internal } // namespace Qt4ProjectManager