forked from qt-creator/qt-creator
Debugger: Fix go to location on interrupt
Avoid checking an invalid QUrl - instead restore old code of always creating one an verifying this instead. Remove the now unused FilePath::isLocal(). Change-Id: I037c43e6fbdb7dc1f8901fc70b581f3c94ab503a Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -940,11 +940,6 @@ bool FilePath::endsWith(const QString &s) const
|
||||
return m_data.endsWith(s, HostOsInfo::fileNameCaseSensitivity());
|
||||
}
|
||||
|
||||
bool FilePath::isLocal() const
|
||||
{
|
||||
return m_url.isEmpty() || m_url.isLocalFile();
|
||||
}
|
||||
|
||||
bool FilePath::isDir() const
|
||||
{
|
||||
QTC_CHECK(m_url.isEmpty()); // FIXME: Not implemented yet.
|
||||
|
@@ -101,7 +101,6 @@ public:
|
||||
bool startsWith(const QString &s) const;
|
||||
bool endsWith(const QString &s) const;
|
||||
|
||||
bool isLocal() const;
|
||||
bool isDir() const;
|
||||
bool isNewerThan(const QDateTime &timeStamp) const;
|
||||
|
||||
|
@@ -465,7 +465,7 @@ void QmlEngine::errorMessageBoxFinished(int result)
|
||||
|
||||
void QmlEngine::gotoLocation(const Location &location)
|
||||
{
|
||||
if (location.fileName().isLocal()) {
|
||||
if (QUrl(location.fileName().toString()).isLocalFile()) { // create QUrl to ensure validity
|
||||
const QString fileName = location.fileName().toString();
|
||||
// internal file from source files -> show generated .js
|
||||
QTC_ASSERT(d->sourceDocuments.contains(fileName), return);
|
||||
|
Reference in New Issue
Block a user