Skip to content
Snippets Groups Projects
Commit f34e0bbf authored by Alessandro Portale's avatar Alessandro Portale Committed by Kai Koehne
Browse files

Html5 app wizard: Adapt to QUrl changes in Qt 4.8.0


These changed have been reverted in Qt 4.8.1 (and 4.8.0 for Symbian).

Task-number: QTCREATORBUG-6883

Change-Id: I66e30fe242ffab56f9966a37a152ec2d5c863847
Reviewed-by: default avatarKai Koehne <kai.koehne@nokia.com>
parent 41a66d74
No related branches found
No related tags found
No related merge requests found
...@@ -99,7 +99,7 @@ QString Html5ApplicationViewerPrivate::adjustPath(const QString &path) ...@@ -99,7 +99,7 @@ QString Html5ApplicationViewerPrivate::adjustPath(const QString &path)
} }
#endif #endif
#endif #endif
return path; return QFileInfo(path).absoluteFilePath();
} }
void Html5ApplicationViewerPrivate::quit() void Html5ApplicationViewerPrivate::quit()
...@@ -130,7 +130,7 @@ Html5ApplicationViewer::~Html5ApplicationViewer() ...@@ -130,7 +130,7 @@ Html5ApplicationViewer::~Html5ApplicationViewer()
void Html5ApplicationViewer::loadFile(const QString &fileName) 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) void Html5ApplicationViewer::loadUrl(const QUrl &url)
......
...@@ -315,7 +315,7 @@ QList<DeploymentFolder> Html5App::deploymentFolders() const ...@@ -315,7 +315,7 @@ QList<DeploymentFolder> Html5App::deploymentFolders() const
return result; return result;
} }
const int Html5App::StubVersion = 10; const int Html5App::StubVersion = 11;
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment