diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-21 10:57:42 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-21 13:14:23 (GMT) |
| commit | e96c1d6ea945c12fb5de929709ab33c476a63cb5 (patch) | |
| tree | bd6ad45e2296ca358ae66440c86de2ddde99385b | |
| parent | c86ab3fcedd3bcfa195d42d45fb732cb8315319d (diff) | |
| download | Qt-e96c1d6ea945c12fb5de929709ab33c476a63cb5.zip Qt-e96c1d6ea945c12fb5de929709ab33c476a63cb5.tar.gz Qt-e96c1d6ea945c12fb5de929709ab33c476a63cb5.tar.bz2 | |
Revert "Make an empty QUrl also be considered non-detached (d == 0)."
as agreed with Warwick.
This reverts commit 089ee7094eabb2058b478f5d2f306a69f6c0b3bf.
| -rw-r--r-- | src/corelib/io/qurl.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qurl/tst_qurl.cpp | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 74e5f74..a131d6c 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -5932,7 +5932,7 @@ void QUrl::detach() */ bool QUrl::isDetached() const { - return d && d->ref == 1; + return !d || d->ref == 1; } diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index ecd6f09..33812fe 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -90,7 +90,6 @@ public slots: private slots: void getSetCheck(); void constructing(); - void isDetached(); void assignment(); void comparison(); void copying(); @@ -319,25 +318,6 @@ void tst_QUrl::constructing() QVERIFY(!buildUNC.isEmpty()); } -void tst_QUrl::isDetached() -{ - QUrl url; - QVERIFY(!url.isDetached()); - - url = "http://qt.nokia.com/"; - QVERIFY(url.isDetached()); - - url.clear(); - QVERIFY(!url.isDetached()); - - url.setHost("qt.nokia.com"); - QVERIFY(url.isDetached()); - - QUrl url2 = url; - QVERIFY(!url.isDetached()); - QVERIFY(!url2.isDetached()); -} - void tst_QUrl::assignment() { QUrl url("http://qt.nokia.com/"); |