Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

1 files changed, 68 insertions, 0 deletions

diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h
index 13031fd..5c1e4cd 100644
--- a/src/dbus/qdbusutil_p.h
+++ b/src/dbus/qdbusutil_p.h
@@ -57,6 +57,7 @@
 #include <QtCore/qvariant.h>
 
 #include <QtDBus/qdbusmacros.h>
+#include <QtDBus/qdbuserror.h>
 
 QT_BEGIN_HEADER
 
@@ -83,6 +84,73 @@ namespace QDBusUtil
     QDBUS_EXPORT bool isValidSingleSignature(const QString &signature);
 
     QDBUS_EXPORT QString argumentToString(const QVariant &variant);
+
+    enum AllowEmptyFlag {
+        EmptyAllowed,
+        EmptyNotAllowed
+    };
+
+    inline bool checkInterfaceName(const QString &name, AllowEmptyFlag empty, QDBusError *error)
+    {
+        if (name.isEmpty()) {
+            if (empty == EmptyAllowed) return true;
+            *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Interface name cannot be empty"));
+            return false;
+        }
+        if (isValidInterfaceName(name)) return true;
+        *error = QDBusError(QDBusError::InvalidInterface, QString::fromLatin1("Invalid interface class: %1").arg(name));
+        return false;
+    }
+
+    inline bool checkBusName(const QString &name, AllowEmptyFlag empty, QDBusError *error)
+    {
+        if (name.isEmpty()) {
+            if (empty == EmptyAllowed) return true;
+            *error = QDBusError(QDBusError::InvalidService, QLatin1String("Service name cannot be empty"));
+            return false;
+        }
+        if (isValidBusName(name)) return true;
+        *error = QDBusError(QDBusError::InvalidService, QString::fromLatin1("Invalid service name: %1").arg(name));
+        return false;
+    }
+
+    inline bool checkObjectPath(const QString &path, AllowEmptyFlag empty, QDBusError *error)
+    {
+        if (path.isEmpty()) {
+            if (empty == EmptyAllowed) return true;
+            *error = QDBusError(QDBusError::InvalidObjectPath, QLatin1String("Object path cannot be empty"));
+            return false;
+        }
+        if (isValidObjectPath(path)) return true;
+        *error = QDBusError(QDBusError::InvalidObjectPath, QString::fromLatin1("Invalid object path: %1").arg(path));
+        return false;
+    }
+
+    inline bool checkMemberName(const QString &name, AllowEmptyFlag empty, QDBusError *error, const char *nameType = 0)
+    {
+        if (!nameType) nameType = "member";
+        if (name.isEmpty()) {
+            if (empty == EmptyAllowed) return true;
+            *error = QDBusError(QDBusError::InvalidMember, QLatin1String(nameType) + QLatin1String(" name cannot be empty"));
+            return false;
+        }
+        if (isValidMemberName(name)) return true;
+        *error = QDBusError(QDBusError::InvalidMember, QString::fromLatin1("Invalid %1 name: %2")
+                            .arg(QString::fromLatin1(nameType), name));
+        return false;
+    }
+
+    inline bool checkErrorName(const QString &name, AllowEmptyFlag empty, QDBusError *error)
+    {
+        if (name.isEmpty()) {
+            if (empty == EmptyAllowed) return true;
+            *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Error name cannot be empty"));
+            return false;
+        }
+        if (isValidErrorName(name)) return true;
+        *error = QDBusError(QDBusError::InvalidInterface, QString::fromLatin1("Invalid error name: %1").arg(name));
+        return false;
+    }
 }
 
 QT_END_NAMESPACE