Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Return a string from resolvedUrl() to match 4.x behavior
Task-number: QTBUG-20960 Change-Id: I9ae99ada5c9bbe7498df24908c6acd202ca73a15 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
- Loading branch information
Aaron Kennedy
authored and
Qt by Nokia
committed
Nov 9, 2011
1 parent
da8d168
commit 0c5f918
Showing
3 changed files
with
30 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
tests/auto/declarative/qdeclarativeqt/data/resolvedUrl.qml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import QtQuick 2.0 | ||
|
||
QtObject { | ||
property string result | ||
property bool isString: false | ||
|
||
Component.onCompleted: { | ||
var a = Qt.resolvedUrl("resolvedUrl.qml"); | ||
result = a; | ||
isString = (typeof a) == "string" | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters