From f34e0bbfdf550d3bcbf797180559e9c25e6ce549 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Wed, 14 Mar 2012 14:08:12 +0100
Subject: [PATCH] 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: Kai Koehne <kai.koehne@nokia.com>
---
.../html5applicationviewer/html5applicationviewer.cpp | 4 ++--
src/plugins/qt4projectmanager/wizards/html5app.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp b/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp
index 574ff58b8aa..4433669b6a6 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 95e798bbb59..6c31d8826a1 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
--
GitLab