Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix Phonon compilation with a namespaced Qt.
  Fix build on WinCE and Symbian: .pro file must match dir name.
  Fix compilation on solaris-g++: ctype functions are sometimes macros
  Fix compilation: no semi-colon after Q_ENUM or Q_PROPERTY

9 files changed, 41 insertions, 5 deletions

diff --git a/examples/declarative/extending/attached/person.h b/examples/declarative/extending/attached/person.h
index 0f86d8b76e..08caebfa63 100644
--- a/examples/declarative/extending/attached/person.h
+++ b/examples/declarative/extending/attached/person.h
@@ -76,7 +76,7 @@ QML_DECLARE_TYPE(ShoeDescription);
 class Person : public QObject {
 Q_OBJECT
 Q_PROPERTY(QString name READ name WRITE setName)
-Q_PROPERTY(ShoeDescription *shoe READ shoe);
+Q_PROPERTY(ShoeDescription *shoe READ shoe)
 public:
     Person(QObject *parent = 0);
 
diff --git a/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp b/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp
index 30dabdfa4c..802cb18d8e 100644
--- a/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp
+++ b/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp
@@ -29,6 +29,9 @@
 #include <QtCore/QMap>
 #include <phonon/audiooutput.h>
 
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
 namespace Phonon
 {
 namespace Gstreamer
@@ -138,6 +141,9 @@ void AudioDataOutput::mediaNodeEvent(const MediaNodeEvent *event)
 
 }} //namespace Phonon::Gstreamer
 
+QT_END_NAMESPACE
+QT_END_HEADER
+
 #include "moc_audiodataoutput.cpp"
 // vim: sw=4 ts=4
 
diff --git a/src/3rdparty/phonon/gstreamer/audiodataoutput.h b/src/3rdparty/phonon/gstreamer/audiodataoutput.h
index 5e30a1d9f3..cd5ef4975f 100644
--- a/src/3rdparty/phonon/gstreamer/audiodataoutput.h
+++ b/src/3rdparty/phonon/gstreamer/audiodataoutput.h
@@ -29,6 +29,9 @@
 #include <phonon/audiodataoutput.h>
 #include <phonon/audiodataoutputinterface.h>
 
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
 namespace Phonon
 {
 namespace Gstreamer
@@ -80,5 +83,8 @@ namespace Gstreamer
     };
 }} //namespace Phonon::Gstreamer
 
+QT_END_NAMESPACE
+QT_END_HEADER
+
 // vim: sw=4 ts=4 tw=80
 #endif // Phonon_FAKE_AUDIODATAOUTPUT_H
diff --git a/src/3rdparty/phonon/phonon/audiodataoutput.cpp b/src/3rdparty/phonon/phonon/audiodataoutput.cpp
index 3a7d3a1f08..fa8ec0df57 100644
--- a/src/3rdparty/phonon/phonon/audiodataoutput.cpp
+++ b/src/3rdparty/phonon/phonon/audiodataoutput.cpp
@@ -26,6 +26,9 @@
 
 #define PHONON_CLASSNAME AudioDataOutput
 
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
 namespace Phonon
 {
 
@@ -62,5 +65,8 @@ void AudioDataOutputPrivate::setupBackendObject()
 
 } // namespace Phonon
 
+QT_END_NAMESPACE
+QT_END_HEADER
+
 #undef PHONON_CLASSNAME
 // vim: sw=4 ts=4 tw=80
diff --git a/src/3rdparty/phonon/phonon/audiodataoutput.h b/src/3rdparty/phonon/phonon/audiodataoutput.h
index 8e8f8e0c90..7a559b3f69 100644
--- a/src/3rdparty/phonon/phonon/audiodataoutput.h
+++ b/src/3rdparty/phonon/phonon/audiodataoutput.h
@@ -26,6 +26,9 @@
 #include "abstractaudiooutput.h"
 #include "phonondefs.h"
 
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 template<typename T> class QVector;
 template<typename Key, typename T> class QMap;
@@ -125,5 +128,8 @@ namespace Phonon
     };
 } // namespace Phonon
 
+QT_END_NAMESPACE
+QT_END_HEADER
+
 // vim: sw=4 ts=4 tw=80
 #endif // Phonon_AUDIODATAOUTPUT_H
diff --git a/src/3rdparty/phonon/phonon/audiodataoutput_p.h b/src/3rdparty/phonon/phonon/audiodataoutput_p.h
index 91103a9c1b..5fd4f801d1 100644
--- a/src/3rdparty/phonon/phonon/audiodataoutput_p.h
+++ b/src/3rdparty/phonon/phonon/audiodataoutput_p.h
@@ -26,6 +26,9 @@
 #include "audiodataoutput.h"
 #include "abstractaudiooutput_p.h"
 
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
 namespace Phonon
 {
 
@@ -44,5 +47,8 @@ class AudioDataOutputPrivate : public AbstractAudioOutputPrivate
 
 } // namespace Phonon
 
+QT_END_NAMESPACE
+QT_END_HEADER
+
 #endif // AUDIODATAOUTPUT_P_H
 // vim: sw=4 ts=4 tw=80
diff --git a/src/3rdparty/phonon/phonon/audiodataoutputinterface.h b/src/3rdparty/phonon/phonon/audiodataoutputinterface.h
index bc1aad05d0..08bc7fcf4d 100644
--- a/src/3rdparty/phonon/phonon/audiodataoutputinterface.h
+++ b/src/3rdparty/phonon/phonon/audiodataoutputinterface.h
@@ -23,6 +23,9 @@
 #ifndef PHONON_AUDIODATAOUTPUTINTERFACE_H
 #define PHONON_AUDIODATAOUTPUTINTERFACE_H
 
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
 namespace Phonon
 {
 
@@ -41,4 +44,7 @@ class AudioDataOutputInterface
 
 Q_DECLARE_INTERFACE(Phonon::AudioDataOutputInterface, "0AudioDataOutputInterface.phonon.kde.org")
 
+QT_END_NAMESPACE
+QT_END_HEADER
+
 #endif // PHONON_AUDIODATAOUTPUTINTERFACE_H
diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index 7d7359692d..1611699a9d 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -2392,7 +2392,7 @@ static bool haveMnemonic(const QString &str)
             // because we get a lot of false positives.
             if (c != '&' && c != ' ' && QChar(c).isPrint()) {
                 const ushort *pp = p;
-                for (; *p < 256 && ::isalpha(*p); p++) ;
+                for (; *p < 256 && isalpha(*p); p++) ;
                 if (pp == p || *p != ';')
                     return true;
                 // This looks like a HTML &entity;, so ignore it. As a HTML string
diff --git a/tools/linguist/shared/po.cpp b/tools/linguist/shared/po.cpp
index 097b4bf9e0..99a8751b98 100644
--- a/tools/linguist/shared/po.cpp
+++ b/tools/linguist/shared/po.cpp
@@ -235,7 +235,7 @@ static QByteArray slurpEscapedString(const QList<QByteArray> &lines, int &l,
         const QByteArray &line = lines.at(l);
         if (line.isEmpty() || !line.startsWith(prefix))
             break;
-        while (::isspace(line[offset])) // No length check, as string has no trailing spaces.
+        while (isspace(line[offset])) // No length check, as string has no trailing spaces.
             offset++;
         if (line[offset] != '"')
             break;
@@ -247,7 +247,7 @@ static QByteArray slurpEscapedString(const QList<QByteArray> &lines, int &l,
             if (c == '"') {
                 if (offset == line.length())
                     break;
-                while (::isspace(line[offset]))
+                while (isspace(line[offset]))
                     offset++;
                 if (line[offset++] != '"') {
                     cd.appendError(QString::fromLatin1(
@@ -305,7 +305,7 @@ static QByteArray slurpEscapedString(const QList<QByteArray> &lines, int &l,
                     break;
                 case 'x':
                     stoff = offset;
-                    while (::isxdigit(line[offset]))
+                    while (isxdigit(line[offset]))
                         if (++offset == line.length())
                             goto premature_eol;
                     msg += line.mid(stoff, offset - stoff).toUInt(0, 16);