diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-02-10 16:57:11 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-10 16:57:11 +0000 |
| commit | 0866680bd904aff4fe2a643a2b81c460cbb99c77 (patch) | |
| tree | 242dae052199994a35f5e68578661175241a0a71 /src/corelib/io/qurl_mac.mm | |
| parent | 34ea269b3b173498312b0203d6875ef3b4ba0253 (diff) | |
| parent | fc35f714340d5361231506dfbead132122f59460 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/io/qurl_mac.mm')
| -rw-r--r-- | src/corelib/io/qurl_mac.mm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/corelib/io/qurl_mac.mm b/src/corelib/io/qurl_mac.mm index c235365ad8..4468bf0f2b 100644 --- a/src/corelib/io/qurl_mac.mm +++ b/src/corelib/io/qurl_mac.mm @@ -54,7 +54,13 @@ QUrl QUrl::fromCFURL(CFURLRef url) CFURLRef QUrl::toCFURL() const { - return CFURLCreateWithString(0, toString(FullyEncoded).toCFString(), 0); + CFURLRef url = 0; + CFStringRef str = toString(FullyEncoded).toCFString(); + if (str) { + url = CFURLCreateWithString(0, str, 0); + CFRelease(str); + } + return url; } QUrl QUrl::fromNSURL(const NSURL *url) |