Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow QML URLs to contain pre-encoded octets
Use QUrl Tolerant parsing mode to permit user-supplied URLs to contain pre-encoded octets which are not mangled by string conversion. Task-number: QTBUG-22756 Change-Id: I4b160b04340b95221d1eb3336bda8c0b38d2e232 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
- Loading branch information
Matthew Vogt
authored and
Qt by Nokia
committed
Jan 18, 2012
1 parent
52c1d7a
commit 3aa53b8
Showing
10 changed files
with
245 additions
and
16 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
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
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
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
41 changes: 41 additions & 0 deletions
41
tests/auto/declarative/qdeclarativeecmascript/data/urlListProperty.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,41 @@ | ||
import QtQuick 2.0 | ||
import Qt.test 1.0 | ||
|
||
Item { | ||
// single url assignment to url list property | ||
MySequenceConversionObject { | ||
id: msco1 | ||
objectName: "msco1" | ||
} | ||
|
||
// single url binding to url list property | ||
MySequenceConversionObject { | ||
id: msco2 | ||
objectName: "msco2" | ||
urlListProperty: "http://qt-project.org/?get%3cDATA%3e"; | ||
} | ||
|
||
// multiple url assignment to url list property | ||
MySequenceConversionObject { | ||
id: msco3 | ||
objectName: "msco3" | ||
} | ||
|
||
// multiple url binding to url list property | ||
MySequenceConversionObject { | ||
id: msco4 | ||
objectName: "msco4" | ||
urlListProperty: [ | ||
"http://qt-project.org/?get%3cDATA%3e", | ||
"http://qt-project.org/?get%3cDATA%3e" | ||
]; | ||
} | ||
|
||
Component.onCompleted: { | ||
msco1.urlListProperty = "http://qt-project.org/?get%3cDATA%3e"; | ||
msco3.urlListProperty = [ | ||
"http://qt-project.org/?get%3cDATA%3e", | ||
"http://qt-project.org/?get%3cDATA%3e" | ||
]; | ||
} | ||
} |
10 changes: 10 additions & 0 deletions
10
tests/auto/declarative/qdeclarativeecmascript/data/urlProperty.2.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,10 @@ | ||
import QtQuick 2.0 | ||
import Qt.test 1.0 | ||
|
||
MyQmlObject { | ||
property bool result | ||
stringProperty: "http://example.org" | ||
urlProperty: stringProperty + "/?get%3cDATA%3e" | ||
value: urlProperty == stringProperty + "/?get%3cDATA%3e" | ||
result: urlProperty == urlProperty | ||
} |
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
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
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
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