From 916460929d1de315262d4a9ee91280ecaf3f58f1 Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Wed, 26 Oct 2011 14:32:23 +0200
Subject: Move the implementation of normalizeTypeInternal()

This function is only used in src/tools/moc/moc.cpp and
src/corelib/kernel/qmetaobject.cpp. We don't need to include the
static, non-inline declaration and definition every time
qmetaobject_p.h is included.

This also silences the related warning from clang:

../../../include/QtCore/5.0.0/QtCore/private/../../../../../src/corelib/kernel/qmetaobject_p.h:171:19: error:
      function 'normalizeTypeInternal' is not needed and will not be emitted
      [-Werror,-Wunneeded-internal-declaration]
static QByteArray normalizeTypeInternal(const char *t, const char *e, ...
                  ^

Change-Id: I6dfb2cb4d9d82a2ae7795f91169aa62f9a5f2c2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
---
 src/tools/moc/moc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/tools')

diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index 9309db1c90..6374a726ac 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -46,7 +46,7 @@
 #include "outputrevision.h"
 
 // for normalizeTypeInternal
-#include <private/qmetaobject_p.h>
+#include <private/qmetaobject_moc_p.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3