Merge commit 'origin/4.6' into kinetic-declarativeui

Conflicts:
	configure.exe

8 files changed, 59 insertions, 61 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index aab05b1..3bbc607 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1159,9 +1159,6 @@ void Configure::parseCmdLine()
             } else {
                 dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-g++";
             }
-        } else if ( dictionary[ "QMAKESPEC" ] == QString( "win32-mwc" ) ) {
-                dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-mwc";
-                dictionary[ "MAKE" ] = "make";
         } else {
             if ( dictionary[ "MAKE" ].isEmpty() ) dictionary[ "MAKE" ] = "make";
             dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32";
diff --git a/tools/designer/src/components/formeditor/deviceprofiledialog.ui b/tools/designer/src/components/formeditor/deviceprofiledialog.ui
index 3186c57..d7a298c 100644
--- a/tools/designer/src/components/formeditor/deviceprofiledialog.ui
+++ b/tools/designer/src/components/formeditor/deviceprofiledialog.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>DeviceProfileDialog</class>
- <widget class="QDialog" name="dialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="dialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,78 +10,78 @@
     <height>209</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QWidget" native="1" name="SystemSettingsWidget" >
-     <layout class="QFormLayout" name="formLayout" >
-      <item row="1" column="0" >
-       <widget class="QLabel" name="m_systemFontFamilyLabel" >
-        <property name="text" >
+    <widget class="QWidget" name="SystemSettingsWidget" native="true">
+     <layout class="QFormLayout" name="formLayout">
+      <item row="1" column="0">
+       <widget class="QLabel" name="m_systemFontFamilyLabel">
+        <property name="text">
          <string>&amp;Family</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>m_systemFontComboBox</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QFontComboBox" name="m_systemFontComboBox" />
+      <item row="1" column="1">
+       <widget class="QFontComboBox" name="m_systemFontComboBox"/>
       </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="m_systemFontSizeLabel" >
-        <property name="text" >
+      <item row="2" column="0">
+       <widget class="QLabel" name="m_systemFontSizeLabel">
+        <property name="text">
          <string>&amp;Point Size</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>m_systemFontSizeCombo</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QComboBox" name="m_systemFontSizeCombo" />
+      <item row="2" column="1">
+       <widget class="QComboBox" name="m_systemFontSizeCombo"/>
       </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="m_styleLabel" >
-        <property name="text" >
+      <item row="3" column="0">
+       <widget class="QLabel" name="m_styleLabel">
+        <property name="text">
          <string>Style</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>m_styleCombo</cstring>
         </property>
        </widget>
       </item>
-      <item row="3" column="1" >
-       <widget class="QComboBox" name="m_styleCombo" />
+      <item row="3" column="1">
+       <widget class="QComboBox" name="m_styleCombo"/>
       </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="m_systemDPILabel" >
-        <property name="text" >
+      <item row="4" column="0">
+       <widget class="QLabel" name="m_systemDPILabel">
+        <property name="text">
          <string>Device DPI</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" >
-       <widget class="qdesigner_internal::DPI_Chooser" native="1" name="m_dpiChooser" />
+      <item row="4" column="1">
+       <widget class="qdesigner_internal::DPI_Chooser" name="m_dpiChooser" native="true"/>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="m_nameLabel" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QLabel" name="m_nameLabel">
+        <property name="text">
          <string>Name</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QLineEdit" name="m_nameLineEdit" />
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="m_nameLineEdit"/>
       </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Open|QDialogButtonBox::Save</set>
      </property>
     </widget>
@@ -95,6 +96,13 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>m_nameLineEdit</tabstop>
+  <tabstop>m_systemFontComboBox</tabstop>
+  <tabstop>m_systemFontSizeCombo</tabstop>
+  <tabstop>m_styleCombo</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/tools/designer/src/lib/shared/stylesheeteditor.cpp b/tools/designer/src/lib/shared/stylesheeteditor.cpp
index c7668b1..b9f9ba2 100644
--- a/tools/designer/src/lib/shared/stylesheeteditor.cpp
+++ b/tools/designer/src/lib/shared/stylesheeteditor.cpp
@@ -240,13 +240,10 @@ void StyleSheetEditorDialog::slotAddGradient(const QString &property)
 
 void StyleSheetEditorDialog::slotAddColor(const QString &property)
 {
-    bool ok;
-    QRgb rgba = QColorDialog::getRgba(0xffffffff, &ok, this);
-    if (!ok)
+    const QColor color = QColorDialog::getColor(0xffffffff, this, QString(), QColorDialog::ShowAlphaChannel);
+    if (!color.isValid())
         return;
 
-    QColor color;
-    color.setRgba(rgba);
     QString colorStr;
 
     if (color.alpha() == 255) {
diff --git a/tools/qdoc3/test/eclipse-integration.qdocconf b/tools/qdoc3/test/eclipse-integration.qdocconf
index aadaae6..13d8ab9 100644
--- a/tools/qdoc3/test/eclipse-integration.qdocconf
+++ b/tools/qdoc3/test/eclipse-integration.qdocconf
@@ -2,9 +2,9 @@ include(qt.qdocconf)
 
 headerdirs = 
 sourcedirs =
-sourcedirs = $QTDIR/../qteclipsetools/main/doc
-imagedirs = $QTDIR/../qteclipsetools/main/doc
-outputdir = $QTDIR/../qteclipsetools/main/doc/html
+sourcedirs = $QTDIR/../qteclipsetools/eclipse_patched/doc
+imagedirs = $QTDIR/../qteclipsetools/eclipse_patched/doc
+outputdir = $QTDIR/../qteclipsetools/eclipse_patched/doc/html
 
 project               = Qt Eclipse Integration
 description           = "Qt Eclipse Integration"
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index f9e3c35..7ceacb2 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -10,6 +10,8 @@ HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
                           "<font color=\"#004faf\">Home</font></a>&nbsp;&middot;" \
                           " <a href=\"classes.html\">" \
                           "<font color=\"#004faf\">All&nbsp;Classes</font></a>&nbsp;&middot;" \
+                          " <a href=\"functions.html\">" \
+                          "<font color=\"#004faf\">All&nbsp;Functions</font></a>&nbsp;&middot;" \
                           " <a href=\"overviews.html\">" \
                           "<font color=\"#004faf\">Overviews</font></a>" \
                           "</td>" \
diff --git a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf
index d61db54..b96c541 100644
--- a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf
+++ b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf
@@ -7,5 +7,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
               "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
               "<td width=\"40%\" align=\"center\"><a href=\"http://qt.nokia.com/doc/trademarks.html\">Trademarks</a></td>\n" \
-              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Eclipse Integration 1.5.2</div></td>\n" \
+              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Eclipse Integration 1.5.3</div></td>\n" \
               "</tr></table></div></address>"
diff --git a/tools/shared/qtgradienteditor/qtcolorbutton.cpp b/tools/shared/qtgradienteditor/qtcolorbutton.cpp
index 1c29b66..5c38b52 100644
--- a/tools/shared/qtgradienteditor/qtcolorbutton.cpp
+++ b/tools/shared/qtgradienteditor/qtcolorbutton.cpp
@@ -68,14 +68,10 @@ public:
 
 void QtColorButtonPrivate::slotEditColor()
 {
-    bool ok;
-    const QRgb rgba = QColorDialog::getRgba(m_color.rgba(), &ok, q_ptr);
-    if (!ok)
+    const QColor newColor = QColorDialog::getColor(m_color, q_ptr, QString(), QColorDialog::ShowAlphaChannel);
+    if (!newColor.isValid() || newColor == q_ptr->color())
         return;
-    const QColor c = QColor::fromRgba(rgba);
-    if (c == q_ptr->color())
-        return;
-    q_ptr->setColor(c);
+    q_ptr->setColor(newColor);
     emit q_ptr->colorChanged(m_color);
 }
 
diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.cpp b/tools/shared/qtpropertybrowser/qteditorfactory.cpp
index 18a596f..1be5ca6 100644
--- a/tools/shared/qtpropertybrowser/qteditorfactory.cpp
+++ b/tools/shared/qtpropertybrowser/qteditorfactory.cpp
@@ -2202,11 +2202,9 @@ void QtColorEditWidget::setValue(const QColor &c)
 
 void QtColorEditWidget::buttonClicked()
 {
-    bool ok = false;
-    QRgb oldRgba = m_color.rgba();
-    QRgb newRgba = QColorDialog::getRgba(oldRgba, &ok, this);
-    if (ok && newRgba != oldRgba) {
-        setValue(QColor::fromRgba(newRgba));
+    const QColor newColor = QColorDialog::getColor(m_color, this, QString(), QColorDialog::ShowAlphaChannel);
+    if (newColor.isValid() && newColor != m_color) {
+        setValue(newColor);
         emit valueChanged(m_color);
     }
 }