Merge remote-tracking branch 'origin/stable' into dev

For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812

1 files changed, 3 insertions, 73 deletions

diff --git a/src/corelib/io/qloggingcategory.h b/src/corelib/io/qloggingcategory.h
index 7a119f4937..15c0519827 100644
--- a/src/corelib/io/qloggingcategory.h
+++ b/src/corelib/io/qloggingcategory.h
@@ -44,14 +44,9 @@
 
 #include <QtCore/qglobal.h>
 #include <QtCore/qdebug.h>
-#include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
 
-class QTracer;
-class QTraceGuard;
-class QLoggingCategoryPrivate;
-
 class Q_CORE_EXPORT QLoggingCategory
 {
     Q_DISABLE_COPY(QLoggingCategory)
@@ -65,7 +60,6 @@ public:
     bool isDebugEnabled() const { return enabledDebug; }
     bool isWarningEnabled() const { return enabledWarning; }
     bool isCriticalEnabled() const { return enabledCritical; }
-    bool isTraceEnabled() const { return enabledTrace; }
 
     const char *categoryName() const { return name; }
 
@@ -80,66 +74,13 @@ public:
     static void setFilterRules(const QString &rules);
 
 private:
-    friend class QLoggingCategoryPrivate;
-    friend class QLoggingRegistry;
-    friend class QTraceGuard;
-    friend class QTracer;
-
-    QLoggingCategoryPrivate *d;
+    void *d; // reserved for future use
     const char *name;
 
     bool enabledDebug;
     bool enabledWarning;
     bool enabledCritical;
-    bool enabledTrace;
-    // reserve space for future use
-    bool placeholder1;
-    bool placeholder2;
-    bool placeholder3;
-};
-
-class Q_CORE_EXPORT QTracer
-{
-    Q_DISABLE_COPY(QTracer)
-public:
-    QTracer() {}
-    virtual ~QTracer() {}
-
-    void addToCategory(QLoggingCategory &category);
-
-    virtual void start() {}
-    virtual void end() {}
-    virtual void record(int) {}
-    virtual void record(const char *) {}
-    virtual void record(const QVariant &) {}
-};
-
-class Q_CORE_EXPORT QTraceGuard
-{
-    Q_DISABLE_COPY(QTraceGuard)
-public:
-    QTraceGuard(QLoggingCategory &category)
-    {
-        target = category.isTraceEnabled() ? &category : 0;
-        if (target)
-            start();
-    }
-
-    ~QTraceGuard()
-    {
-        if (target)
-            end();
-    }
-
-    QTraceGuard &operator<<(int msg);
-    QTraceGuard &operator<<(const char *msg);
-    QTraceGuard &operator<<(const QVariant &msg);
-
-private:
-    void start();
-    void end();
-
-    QLoggingCategory *target;
+    bool placeholder[5]; // reserve for future use
 };
 
 #define Q_DECLARE_LOGGING_CATEGORY(name) \
@@ -154,7 +95,7 @@ private:
     }
 
 #define qCDebug(category) \
-    for (bool enabled = category().isDebugEnabled(); enabled; enabled = false) \
+    for (bool enabled = category().isDebugEnabled(); Q_UNLIKELY(enabled); enabled = false) \
         QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, category().categoryName()).debug()
 #define qCWarning(category) \
     for (bool enabled = category().isWarningEnabled(); enabled; enabled = false) \
@@ -162,17 +103,6 @@ private:
 #define qCCritical(category) \
     for (bool enabled = category().isCriticalEnabled(); enabled; enabled = false) \
         QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, category().categoryName()).critical()
-#define qCTrace(category) \
-    for (bool enabled = category.isTraceEnabled(); enabled; enabled = false) \
-        QTraceGuard(category)
-
-
-#define Q_TRACE_GUARD_NAME_HELPER(line) qTraceGuard ## line
-#define Q_TRACE_GUARD_NAME(line) Q_TRACE_GUARD_NAME_HELPER(line)
-
-#define qCTraceGuard(category) \
-    QTraceGuard Q_TRACE_GUARD_NAME(__LINE__)(category);
-
 
 #if defined(QT_NO_DEBUG_OUTPUT)
 #  undef qCDebug