Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

5 files changed, 62 insertions, 21 deletions

diff --git a/dist/changes-4.5.3 b/dist/changes-4.5.3
index f3a36d3..189baee 100644
--- a/dist/changes-4.5.3
+++ b/dist/changes-4.5.3
@@ -30,6 +30,19 @@ information about a particular change.
 - QDoubleSpinBox
     * [255019] Fixed a crash when using large value for decimals.
 
+- QFileDialog
+    * [None] Fix a bug when activating HideNameFilterDetails on Windows filedialog.
+    * [258084] QFileDialog static functions doesn't honor the DontUseNativeDialog flag.
+
+- QGraphicsItem
+    * [258956] Fix ancestor flags that are not correctly update when reparenting.
+
+- QGraphicsView
+    * [258356] Fix the hand scrolling in QGraphicsView that will stop unexpectedly.
+
+- QGraphicsWidget
+    * [257232] Fix regression in clip path calculation for QGraphicsWidget.
+
 - QInputDialog
     * [255502] Fixed bug in getDouble().
 
@@ -86,6 +99,8 @@ Qt for Linux/X11
 - Fixed a bug where an empty KDEDIRS variable would bring /share into the icon
   search path.
 - [KDE 191759] Plasma spinning in endless loop.
+- QClipboard can copy/paste on all screens in a multiscreen configuration.
+- Fixed a bug that prevented QClipboard to work after some time.
 
 
 Qt for Mac OS X
@@ -101,11 +116,14 @@ Qt for Mac OS X
 - Fixed the wizard background images for Snow Leopard.
 
 
+Qt for Windows
+-----------------
+- [250188] Fixed size windows will show the maximize button if asked explicitely.
+
 Qt for Windows CE
 -----------------
 - [260702] Fixed restoring of minimized Windows.
 
-
 ****************************************************************************
 *                          Plugins                                         *
 ****************************************************************************
diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp
index 005905b..8acd599 100644
--- a/src/sql/drivers/tds/qsql_tds.cpp
+++ b/src/sql/drivers/tds/qsql_tds.cpp
@@ -747,7 +747,9 @@ QString QTDSDriver::formatValue(const QSqlField &field,
         r = QLatin1String("NULL");
     else if (field.type() == QVariant::DateTime) {
         if (field.value().toDateTime().isValid()){
-            r = field.value().toDateTime().toString(QLatin1String("'yyyyMMdd hh:mm:ss'"));
+            r = field.value().toDateTime().toString(QLatin1String("yyyyMMdd hh:mm:ss"));
+            r.prepend(QLatin1String("'"));
+            r.append(QLatin1String("'"));
         } else
             r = QLatin1String("NULL");
     } else if (field.type() == QVariant::ByteArray) {
@@ -794,4 +796,15 @@ QSqlIndex QTDSDriver::primaryIndex(const QString& tablename) const
     return idx;
 }
 
+QString QTDSDriver::escapeIdentifier(const QString &identifier, IdentifierType type) const
+{
+    QString res = identifier;
+    if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) {
+        res.replace(QLatin1Char('"'), QLatin1String("\"\""));
+        res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));
+        res.replace(QLatin1Char('.'), QLatin1String("\".\""));
+    }
+    return res;
+}
+
 QT_END_NAMESPACE
diff --git a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h
index 6001106..0ceae6d 100644
--- a/src/sql/drivers/tds/qsql_tds.h
+++ b/src/sql/drivers/tds/qsql_tds.h
@@ -116,6 +116,8 @@ public:
                          bool trimStrings) const;
     QVariant handle() const;
 
+    QString escapeIdentifier(const QString &identifier, IdentifierType type) const;
+
 protected:
     bool beginTransaction();
     bool commitTransaction();
diff --git a/translations/qt_help_ru.ts b/translations/qt_help_ru.ts
index c2dc041..f55dccc 100644
--- a/translations/qt_help_ru.ts
+++ b/translations/qt_help_ru.ts
@@ -233,17 +233,17 @@
     <message>
         <location line="+80"/>
         <source>Insert contents...</source>
-        <translation>Добавление содержания...</translation>
+        <translation>Добавление оглавления...</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Cannot insert contents!</source>
-        <translation>Не удалось добавить содержание!</translation>
+        <translation>Не удалось добавить оглавление!</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Cannot register contents!</source>
-        <translation>Не удалось зарегистрировать содержание!</translation>
+        <translation>Не удалось зарегистрировать оглавление!</translation>
     </message>
 </context>
 <context>
diff --git a/translations/qtconfig_ru.ts b/translations/qtconfig_ru.ts
index db71274..33ee556 100644
--- a/translations/qtconfig_ru.ts
+++ b/translations/qtconfig_ru.ts
@@ -56,18 +56,18 @@
         <location line="+2"/>
         <location line="+1"/>
         <source>X11</source>
-        <translation></translation>
+        <translation>X11</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Use X11 Overlays</source>
-        <translation type="unfinished">Использовать оверлеи X11</translation>
+        <translation>Использовать оверлеи X11</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+1"/>
         <source>OpenGL</source>
-        <translation></translation>
+        <translation>OpenGL</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -518,7 +518,11 @@
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://phonon.kde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://phonon.kde.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://phonon.kde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://phonon.kde.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -532,7 +536,11 @@ p, li { white-space: pre-wrap; }
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://gstreamer.freedesktop.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://gstreamer.freedesktop.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -556,7 +564,7 @@ p, li { white-space: pre-wrap; }
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Note: changes to these settings may prevent applications from starting up correctly.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
@@ -845,52 +853,52 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+40"/>
         <source>ButtonGroup</source>
-        <translation type="unfinished"></translation>
+        <translation>ButtonGroup</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>RadioButton1</source>
-        <translation type="unfinished"></translation>
+        <translation>RadioButton1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RadioButton2</source>
-        <translation type="unfinished"></translation>
+        <translation>RadioButton2</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>RadioButton3</source>
-        <translation type="unfinished"></translation>
+        <translation>RadioButton3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>ButtonGroup2</source>
-        <translation type="unfinished"></translation>
+        <translation>ButtonGroup2</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>CheckBox1</source>
-        <translation type="unfinished"></translation>
+        <translation>CheckBox1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>CheckBox2</source>
-        <translation type="unfinished"></translation>
+        <translation>CheckBox2</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>LineEdit</source>
-        <translation type="unfinished"></translation>
+        <translation>LineEdit</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>ComboBox</source>
-        <translation type="unfinished"></translation>
+        <translation>ComboBox</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>PushButton</source>
-        <translation type="unfinished"></translation>
+        <translation>PushButton</translation>
     </message>
     <message>
         <location line="+41"/>