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:
  Designer: Minor BT issue: '-' button in Signal/Slot editor not updated.
  Changelog: 4.7.1 (uic/Designer).
  Incorrect translations for application menu items on Mac OS X.
  Update the changelog with the SSE work done for Qt 4.7.1
  build configure.exe directly in source dir
  fix build key generation for real
  my changes for 4.7.1
  My Qt 4.7.1 changes

5 files changed, 37 insertions, 7 deletions

diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index c8b26c2..7676368 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -26,6 +26,11 @@ Optimizations
  - Improved the benchmarking library's timing code
     * Uses a faster access to the system clock
 
+ - Introduction of SSSE3 for alpha blending of images.
+
+ - On x86 and 86_64, the memory access has been improved for alpha blending
+   and for some composition functions.
+
  * See list of Important Behavior Changes below
 
 
@@ -40,6 +45,15 @@ QtCore
 QtGui
 -----
 
+ - QGraphicsWidget
+	* [QTBUG-13188] Make sure a font that has propagated from a parent can
+	  be set on a QPainter.
+	  
+	  
+ - QStaticText
+    * [QTBUG-12614] Fix crash with zero-width string.
+	* [QTBUG-12540] Fix rendering of large glyphs with OpenGL2 paint engine.
+
 
 QtDBus
 ------
@@ -51,6 +65,10 @@ QtMultimedia
 
 QtNetwork
 ---------
+ - QSslConfiguration
+    * [QTBUG-13265] fix crash with empty configuration
+ - QSslCertificate
+    * [QTBUG-12489] support dates > 2049
 
 
 QtOpenGL
@@ -72,6 +90,12 @@ QtSql
 QtSvg
 -----
 
+QtXmlPatterns
+-------------
+ - XML Schema internals:
+    * [QTBUG-11559] Only parse 3 digits of time fraction
+
+
 
 Qt Plugins
 ----------
@@ -88,7 +112,7 @@ Qt for Unix (X11 and Mac OS X)
 
 Qt for Linux/X11
 ----------------
-
+ - The configure script now detects all vector extensions of x86 and x86_64
 
 Qt for Windows
 --------------
@@ -96,7 +120,7 @@ Qt for Windows
 
 Qt for Mac OS X
 ---------------
-
+ - The configure script now detects all vector extensions of x86 and x86_64
 
 Qt for Symbian
 --------------
@@ -110,6 +134,7 @@ Qt for Symbian
  - Designer
 
  - uic
+  * Improve warnings and error reports
 
 ****************************************************************************
 *                     Important Behavior Changes                           *
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 43d5772..185af9a 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -2397,8 +2397,13 @@ static const char *application_menu_strings[] = {
     };
 QString qt_mac_applicationmenu_string(int type)
 {
-    return qApp->translate("MAC_APPLICATION_MENU",
-                           application_menu_strings[type]);
+    QString menuString = QString::fromLatin1(application_menu_strings[type]);
+    QString translated = qApp->translate("QMenuBar", application_menu_strings[type]);
+    if (translated != menuString)
+        return translated;
+    else
+        return qApp->translate("MAC_APPLICATION_MENU",
+                               application_menu_strings[type]);
 }
 #endif
 #endif
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index 8a62fe1..810f006 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -1,5 +1,5 @@
 TARGET    = configure
-DESTDIR   = ../..
+DESTDIR   = $$PWD/../..  # build directly in source dir
 
 CONFIG   += console flat
 CONFIG   -= moc qt
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 17bbadf..3808c4e 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2421,7 +2421,7 @@ void Configure::generateBuildKey()
                        + buildSymbianKey + "\"\n"
                        "#else\n"
                        // Debug builds
-                       "# if (!QT_NO_DEBUG)\n"
+                       "# if !defined(QT_NO_DEBUG)\n"
                        "#  if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))\n"
                        + build64Key.arg("debug") + "\"\n"
                        "#  else\n"
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index 5547761..794722e 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -724,7 +724,7 @@ SignalSlotEditorWindow::SignalSlotEditorWindow(QDesignerFormEditorInterface *cor
                                 | QAbstractItemView::EditKeyPressed);
     m_view->setRootIsDecorated(false);
     m_view->setTextElideMode (Qt::ElideMiddle);
-    connect(m_view, SIGNAL(activated(QModelIndex)), this, SLOT(updateUi()));
+    connect(m_view->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(updateUi()));
     connect(m_view->header(), SIGNAL(sectionDoubleClicked(int)), m_view, SLOT(resizeColumnToContents(int)));
 
     QVBoxLayout *layout = new QVBoxLayout(this);