From 640ae542541b66a5da85ce76309f9595ed2c8bf3 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Tue, 29 Sep 2009 13:18:05 +0200 Subject: added my changes to the changelog Reviewed-by: trustme --- dist/changes-4.5.3 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dist/changes-4.5.3 b/dist/changes-4.5.3 index f3a36d3..1edacac 100644 --- a/dist/changes-4.5.3 +++ b/dist/changes-4.5.3 @@ -86,6 +86,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 +103,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 * **************************************************************************** -- cgit v0.12 From 8eed62921fd4b1ca40bb77fed32f2f7c9bea12e7 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 29 Sep 2009 16:46:24 +0200 Subject: My changelog for 4.5.3. --- dist/changes-4.5.3 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dist/changes-4.5.3 b/dist/changes-4.5.3 index 1edacac..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(). -- cgit v0.12 From 7e979a9a0330a533bbe1693ba68d3737af664a77 Mon Sep 17 00:00:00 2001 From: Ritt Konstantin Date: Tue, 29 Sep 2009 16:55:26 +0200 Subject: minor fixes in Russian translations Merge-request: 1611 Reviewed-by: Oswald Buddenhagen --- translations/qt_help_ru.ts | 6 +++--- translations/qtconfig_ru.ts | 40 ++++++++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 19 deletions(-) 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 @@ Insert contents... - Добавление содержания... + Добавление оглавления... Cannot insert contents! - Не удалось добавить содержание! + Не удалось добавить оглавление! Cannot register contents! - Не удалось зарегистрировать содержание! + Не удалось зарегистрировать оглавление! 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 @@ X11 - + X11 Use X11 Overlays - Использовать оверлеи X11 + Использовать оверлеи X11 OpenGL - + OpenGL @@ -518,7 +518,11 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org</span></a></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org</span></a></p></body></html> @@ -532,7 +536,11 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> @@ -556,7 +564,7 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Note: changes to these settings may prevent applications from starting up correctly.</span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> @@ -845,52 +853,52 @@ p, li { white-space: pre-wrap; } ButtonGroup - + ButtonGroup RadioButton1 - + RadioButton1 RadioButton2 - + RadioButton2 RadioButton3 - + RadioButton3 ButtonGroup2 - + ButtonGroup2 CheckBox1 - + CheckBox1 CheckBox2 - + CheckBox2 LineEdit - + LineEdit ComboBox - + ComboBox PushButton - + PushButton -- cgit v0.12 From 9a7624ce5c4f78f89408eb0d9a33b1cd1569eb3c Mon Sep 17 00:00:00 2001 From: Bill King Date: Wed, 30 Sep 2009 15:26:42 +1000 Subject: (TDS) Fixes missing field/table name escaping. --- src/sql/drivers/tds/qsql_tds.cpp | 11 +++++++++++ src/sql/drivers/tds/qsql_tds.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp index 005905b..dddc1b4 100644 --- a/src/sql/drivers/tds/qsql_tds.cpp +++ b/src/sql/drivers/tds/qsql_tds.cpp @@ -794,4 +794,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(); -- cgit v0.12 From 1ceaa588f254888e0d9cf73e8d094dfdb8f3b8ab Mon Sep 17 00:00:00 2001 From: Bill King Date: Wed, 30 Sep 2009 15:31:48 +1000 Subject: (TDS) Fixes improper formatting of date values Task-number: QT-754 --- src/sql/drivers/tds/qsql_tds.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp index dddc1b4..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) { -- cgit v0.12