summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/network/access/qnetworkcookie.cpp37
-rw-r--r--src/network/access/qnetworkcookie.h4
-rw-r--r--src/network/access/qnetworkrequest.cpp12
-rw-r--r--src/network/access/qnetworkrequest.h4
-rw-r--r--src/sql/kernel/qsqlfield.cpp11
-rw-r--r--src/sql/kernel/qsqlfield.h6
-rw-r--r--src/sql/kernel/qsqlresult.cpp4
-rw-r--r--tests/auto/_Categories/QtGui.txt2
-rw-r--r--tests/auto/qfileinfo/tst_qfileinfo.cpp11
9 files changed, 17 insertions, 74 deletions
diff --git a/src/network/access/qnetworkcookie.cpp b/src/network/access/qnetworkcookie.cpp
index dd5edb0..854bd17 100644
--- a/src/network/access/qnetworkcookie.cpp
+++ b/src/network/access/qnetworkcookie.cpp
@@ -97,43 +97,6 @@ QT_BEGIN_NAMESPACE
/*!
Create a new QNetworkCookie object, initializing the cookie name
- and its value to empty QByteArray
-
- A cookie is only valid if it has a name. However, the value is
- opaque to the application and being empty may have significance to
- the remote server.
-*/
-QNetworkCookie::QNetworkCookie()
- : d(new QNetworkCookiePrivate)
-{
- qRegisterMetaType<QNetworkCookie>();
- qRegisterMetaType<QList<QNetworkCookie> >();
-
- d->name = QByteArray();
- d->value = QByteArray();
-}
-
-/*!
- Create a new QNetworkCookie object, initializing the cookie name
- to \a name and its value to empty QByteArray.
-
- A cookie is only valid if it has a name. However, the value is
- opaque to the application and being empty may have significance to
- the remote server.
-*/
-QNetworkCookie::QNetworkCookie( const QByteArray &name )
- : d(new QNetworkCookiePrivate)
-{
- qRegisterMetaType<QNetworkCookie>();
- qRegisterMetaType<QList<QNetworkCookie> >();
-
- d->name = name;
- d->value = QByteArray();
-}
-
-
-/*!
- Create a new QNetworkCookie object, initializing the cookie name
to \a name and its value to \a value.
A cookie is only valid if it has a name. However, the value is
diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index 35c7095..ef309a8 100644
--- a/src/network/access/qnetworkcookie.h
+++ b/src/network/access/qnetworkcookie.h
@@ -67,9 +67,7 @@ public:
Full
};
- QNetworkCookie();
- QNetworkCookie(const QByteArray &name );
- QNetworkCookie(const QByteArray &name, const QByteArray &value );
+ QNetworkCookie(const QByteArray &name = QByteArray(), const QByteArray &value = QByteArray());
QNetworkCookie(const QNetworkCookie &other);
~QNetworkCookie();
QNetworkCookie &operator=(const QNetworkCookie &other);
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index caa8669..d6d76f7 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -242,18 +242,6 @@ public:
};
/*!
- Constructs a QNetworkRequest object with empty QUrl.
-
- \sa url(), setUrl()
-*/
-QNetworkRequest::QNetworkRequest()
- : d(new QNetworkRequestPrivate)
-{
- d->url = QUrl();
-}
-
-
-/*!
Constructs a QNetworkRequest object with \a url as the URL to be
requested.
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index cf06f7c..1ea7934 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -87,9 +87,7 @@ public:
AlwaysCache
};
-
- explicit QNetworkRequest();
- explicit QNetworkRequest(const QUrl &url);
+ explicit QNetworkRequest(const QUrl &url = QUrl());
QNetworkRequest(const QNetworkRequest &other);
~QNetworkRequest();
QNetworkRequest &operator=(const QNetworkRequest &other);
diff --git a/src/sql/kernel/qsqlfield.cpp b/src/sql/kernel/qsqlfield.cpp
index 4bb56a3..b528850 100644
--- a/src/sql/kernel/qsqlfield.cpp
+++ b/src/sql/kernel/qsqlfield.cpp
@@ -159,20 +159,11 @@ public:
\sa setRequiredStatus() setLength() setPrecision() setDefaultValue() setGenerated() setReadOnly()
*/
-QSqlField::QSqlField()
-{
- d = new QSqlFieldPrivate(QString(), QVariant::Invalid);
-}
-
-QSqlField::QSqlField(const QString& fieldName)
-{
- d = new QSqlFieldPrivate(fieldName, QVariant::Invalid);
-}
-
QSqlField::QSqlField(const QString& fieldName, QVariant::Type type)
{
d = new QSqlFieldPrivate(fieldName, type);
}
+
/*!
Constructs a copy of \a other.
*/
diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h
index d70af15..2c3b52a 100644
--- a/src/sql/kernel/qsqlfield.h
+++ b/src/sql/kernel/qsqlfield.h
@@ -58,9 +58,9 @@ class Q_SQL_EXPORT QSqlField
public:
enum RequiredStatus { Unknown = -1, Optional = 0, Required = 1 };
- QSqlField();
- QSqlField(const QString& fieldName);
- QSqlField(const QString& fieldName, QVariant::Type type);
+ QSqlField(const QString& fieldName = QString(),
+ QVariant::Type type = QVariant::Invalid);
+
QSqlField(const QSqlField& other);
QSqlField& operator=(const QSqlField& other);
bool operator==(const QSqlField& other) const;
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp
index 2a1ba64..93c9d9f 100644
--- a/src/sql/kernel/qsqlresult.cpp
+++ b/src/sql/kernel/qsqlresult.cpp
@@ -53,9 +53,7 @@
QT_BEGIN_NAMESPACE
struct QHolder {
- QHolder(): holderName(QString()), holderPos(-1) {}
- QHolder(const QString& hldr): holderName(hldr), holderPos(-1) {}
- QHolder(const QString& hldr, int index): holderName(hldr), holderPos(index) {}
+ QHolder(const QString& hldr = QString(), int index = -1): holderName(hldr), holderPos(index) {}
bool operator==(const QHolder& h) const { return h.holderPos == holderPos && h.holderName == holderName; }
bool operator!=(const QHolder& h) const { return h.holderPos != holderPos || h.holderName != holderName; }
QString holderName;
diff --git a/tests/auto/_Categories/QtGui.txt b/tests/auto/_Categories/QtGui.txt
index e07216f..77830b2 100644
--- a/tests/auto/_Categories/QtGui.txt
+++ b/tests/auto/_Categories/QtGui.txt
@@ -38,7 +38,7 @@ qdesktopwidget
qdial
qdialog
qdialogbuttonbox
-qdirectpainter cetest-subdir: test
+#qdirectpainter cetest-subdir: test TEST IS FOR EMBEDDED LINUX ONLY
qdirmodel
qdockwidget
qdoublespinbox
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 4a091e3..078ea07 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -237,7 +237,6 @@ void tst_QFileInfo::copy()
tst_QFileInfo::tst_QFileInfo()
{
- Q_SET_DEFAULT_IAP
}
void tst_QFileInfo::isFile_data()
@@ -331,6 +330,9 @@ void tst_QFileInfo::isRoot_data()
QTest::newRow("drive 1") << "c:" << false;
QTest::newRow("drive 2") << "c:/" << true;
QTest::newRow("drive 3") << "p:/" << false;
+#endif
+
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
QTest::newRow("unc 1") << "//" + QtNetworkSettings::winServerName() << true;
QTest::newRow("unc 2") << "//" + QtNetworkSettings::winServerName() + "/" << true;
QTest::newRow("unc 3") << "//" + QtNetworkSettings::winServerName() + "/testshare" << false;
@@ -485,6 +487,8 @@ void tst_QFileInfo::canonicalFilePath()
QCOMPARE(info1.canonicalFilePath(), info2.canonicalFilePath());
}
}
+# if !defined(Q_OS_SYMBIAN)
+ // Symbian doesn't support links to directories
{
const QString link(QDir::tempPath() + QDir::separator() + "tst_qfileinfo");
QFile::remove(link);
@@ -516,6 +520,7 @@ void tst_QFileInfo::canonicalFilePath()
QCOMPARE(info1.canonicalFilePath(), info2.canonicalFilePath());
}
}
+# endif
#endif
}
@@ -725,7 +730,9 @@ void tst_QFileInfo::permission()
QFETCH(QString, file);
QFETCH(int, perms);
QFETCH(bool, expected);
- QEXPECT_FAIL("data0", "No user based rights in Symbian OS - SOS needs platform security tests instead", Abort);
+#ifdef Q_OS_SYMBIAN
+ QSKIP("No user based rights in Symbian OS - SOS needs platform security tests instead", SkipAll);
+#endif
QFileInfo fi(file);
QCOMPARE(fi.permission(QFile::Permissions(perms)), expected);
}
generated by cgit v0.12 at 2025-08-12 10:33:40 (GMT)