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: (28 commits)
  Mac: Select Carbon when using the 10.4u SDK.
  fix connecting to an ID.
  make the value of QMAKE_QMAKE somewhat less magic
  Assistant: Don't warn for non-existing English to English translations.
  Assistant: Un-watch files at shutdown.
  Help system: Build search index with low priority.
  Fixed a regression in the syntax highlighter
  Add a template specialisation for QArgument when T is a reference.
  Always run syncqt if using a Git checkout.
  Added comment about usage of strncpy_s function in VC++ > 14.00
  Compile.
  OS X 10.4 compile error; required casting int to GLint.
  QtDeclarative: Fix compiler warnings
  Implement alien widgets on Mac/Cocoa.
  QDeclarativeView: Add a Designer plugin.
  QDeclarativeView: Make usable in Designer
  minor optimization: don't mark contents as dirty if nothing was changed
  minor optimization: ignore invalid preeditAreaPosition/preeditAreaText
  remove unused code
  minor clean-ups and styling fixes
  ...

2 files changed, 8 insertions, 8 deletions

diff --git a/src/multimedia/base/qpaintervideosurface.cpp b/src/multimedia/base/qpaintervideosurface.cpp
index 97fddc9..fc3d493 100644
--- a/src/multimedia/base/qpaintervideosurface.cpp
+++ b/src/multimedia/base/qpaintervideosurface.cpp
@@ -1158,14 +1158,14 @@ QAbstractVideoSurface::Error QVideoSurfaceGlslPainter::paint(
             glBindTexture(GL_TEXTURE_2D, m_textureIds[2]);
             glActiveTexture(GL_TEXTURE0);
 
-            m_program.setUniformValue("texY", 0);
-            m_program.setUniformValue("texU", 1);
-            m_program.setUniformValue("texV", 2);
+            m_program.setUniformValue("texY", GLint(0));
+            m_program.setUniformValue("texU", GLint(1));
+            m_program.setUniformValue("texV", GLint(2));
         } else {
             glActiveTexture(GL_TEXTURE0);
             glBindTexture(GL_TEXTURE_2D, m_textureIds[0]);
 
-            m_program.setUniformValue("texRgb", 0);
+            m_program.setUniformValue("texRgb", GLint(0));
         }
         m_program.setUniformValue("colorMatrix", m_colorMatrix);
 
diff --git a/src/multimedia/qml/qsoundeffect_pulse_p.cpp b/src/multimedia/qml/qsoundeffect_pulse_p.cpp
index 7e9a25c..d99bf4b 100644
--- a/src/multimedia/qml/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/qml/qsoundeffect_pulse_p.cpp
@@ -63,7 +63,7 @@
 
 #include "qsoundeffect_pulse_p.h"
 
-#if(Q_WS_MAEMO_5)
+#if defined(Q_WS_MAEMO_5)
 #include <pulse/ext-stream-restore.h>
 #endif
 
@@ -157,7 +157,7 @@ private:
         lock();
         m_context = pa_context_new(m_mainLoopApi, QString(QLatin1String("QtPulseAudio:%1")).arg(::getpid()).toAscii().constData());
 
-#if(Q_WS_MAEMO_5)
+#if defined(Q_WS_MAEMO_5)
         pa_context_set_state_callback(m_context, context_state_callback, this);
 #endif
         if (m_context == 0) {
@@ -185,7 +185,7 @@ private:
         m_prepared = false;
     }
 
-#if(Q_WS_MAEMO_5)
+#if defined(Q_WS_MAEMO_5)
     static void context_state_callback(pa_context *c, void *userdata)
     {
         PulseDaemon *self = reinterpret_cast<PulseDaemon*>(userdata);
@@ -301,7 +301,7 @@ void QSoundEffectPrivate::play()
     pa_volume_t m_vol = PA_VOLUME_NORM;
 
     daemon()->lock();
-#if(Q_WS_MAEMO_5)
+#if defined(Q_WS_MAEMO_5)
     m_vol = PA_VOLUME_NORM/100*((daemon()->volume()+m_vol)/2);
 #endif
     pa_operation_unref(