feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Html5 app wizard: Adapt to QUrl changes in Qt 4.8.0

Browse Source 
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>
This commit is contained in:
Alessandro Portale
2012-03-14 14:08:12 +01:00
committed by Kai Koehne
parent 41a66d7478
commit f34e0bbfdf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp
View File

@@ -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()
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)

2
src/plugins/qt4projectmanager/wizards/html5app.cpp
View File

@@ -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