From 1096b698c5339ec77ab11a5a17dc4eefad57d3dc Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Tue, 18 May 2010 15:37:06 +0200 Subject: Doc: Adding support for IE 6, 7 and 8 Fixing index page bugs --- tools/qdoc3/htmlgenerator.cpp | 15 +++++++++++++++ tools/qdoc3/test/assistant.qdocconf | 3 +++ tools/qdoc3/test/designer.qdocconf | 3 +++ tools/qdoc3/test/linguist.qdocconf | 3 +++ tools/qdoc3/test/qdeclarative.qdocconf | 3 +++ tools/qdoc3/test/qmake.qdocconf | 3 +++ tools/qdoc3/test/qt-build-docs.qdocconf | 3 +++ tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 5 ++++- tools/qdoc3/test/qt-html-templates.qdocconf | 6 +++++- tools/qdoc3/test/qt.qdocconf | 3 +++ 10 files changed, 45 insertions(+), 2 deletions(-) diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 5495e34..e352364 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1801,6 +1801,21 @@ void HtmlGenerator::generateHeader(const QString& title, out() << " " << shortVersion << protectEnc(title) << "\n"; + out() << " "; + out() << ""; + out() << ""; + out() << ""; + + //out() << " Qt Reference Documentation"; out() << " \n"; out() << " \n"; diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index 112b1b2..3711ec4 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -36,6 +36,9 @@ qhp.Assistant.extraFiles = images/bg_l.png \ images/dynamiclayouts-example.png \ scripts/functions.js \ scripts/jquery.js \ + style/style_ie6.css \ + style/style_ie7.css \ + style/style_ie8.css \ style/style.css qhp.Assistant.filterAttributes = qt 4.7.0 tools assistant diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index d4da292..39da68b 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -36,6 +36,9 @@ qhp.Designer.extraFiles = images/bg_l.png \ images/dynamiclayouts-example.png \ scripts/functions.js \ scripts/jquery.js \ + style/style_ie6.css \ + style/style_ie7.css \ + style/style_ie8.css \ style/style.css qhp.Designer.filterAttributes = qt 4.7.0 tools designer diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index 7420b4f..dba4fb5 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -36,6 +36,9 @@ qhp.Linguist.extraFiles = images/bg_l.png \ images/dynamiclayouts-example.png \ scripts/functions.js \ scripts/jquery.js \ + style/style_ie6.css \ + style/style_ie7.css \ + style/style_ie8.css \ style/style.css qhp.Linguist.filterAttributes = qt 4.7.0 tools linguist diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf index 8015f57..f744879 100644 --- a/tools/qdoc3/test/qdeclarative.qdocconf +++ b/tools/qdoc3/test/qdeclarative.qdocconf @@ -47,6 +47,9 @@ qhp.Qml.extraFiles = images/bg_l.png \ images/dynamiclayouts-example.png \ scripts/functions.js \ scripts/jquery.js \ + style/style_ie6.css \ + style/style_ie7.css \ + style/style_ie8.css \ style/style.css qhp.Qml.filterAttributes = qt 4.6.0 qtrefdoc diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index 49d088e..b7f4115 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -36,6 +36,9 @@ qhp.qmake.extraFiles = images/bg_l.png \ images/dynamiclayouts-example.png \ scripts/functions.js \ scripts/jquery.js \ + style/style_ie6.css \ + style/style_ie7.css \ + style/style_ie8.css \ style/style.css qhp.qmake.filterAttributes = qt 4.7.0 tools qmake diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index f0c2535..d3c855f 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -42,6 +42,9 @@ qhp.Qt.extraFiles = index.html \ images/dynamiclayouts-example.png \ scripts/functions.js \ scripts/jquery.js \ + style/style_ie6.css \ + style/style_ie7.css \ + style/style_ie8.css \ style/style.css diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf index a00d5a1..e9bc00c 100644 --- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf @@ -50,7 +50,10 @@ qhp.Qt.extraFiles = index.html \ images/dynamiclayouts-example.png \ scripts/functions.js \ scripts/jquery.js \ - style/style.css + style/style_ie6.css \ + style/style_ie7.css \ + style/style_ie8.css \ + style/style.css language = Cpp diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 9af2f92..e83e666 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -1,4 +1,8 @@ -HTML.stylesheets = style/style.css +HTML.stylesheets = style/style_ie6.css \ + style/style_ie7.css \ + style/style_ie8.css \ + style/style.css + HTML.postheader = "
\n" \ "
\n" \ " Home
\n" \ diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 2f6983a..83a35a9 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -46,6 +46,9 @@ qhp.Qt.extraFiles = index.html \ images/dynamiclayouts-example.png \ scripts/functions.js \ scripts/jquery.js \ + style/style_ie6.css \ + style/style_ie7.css \ + style/style_ie8.css \ style/style.css qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc -- cgit v0.12 From 146bb5b382dc24f8f9f0c48d09e4b2491caae72f Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Tue, 18 May 2010 14:55:03 +0200 Subject: Fix cosmetic issue in designer filter edits This makes the icon position similar to Qt Creator and more consistent. Reviewed-by: trustme --- tools/designer/src/lib/shared/filterwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/designer/src/lib/shared/filterwidget.cpp b/tools/designer/src/lib/shared/filterwidget.cpp index 9363b7c..a501c02 100644 --- a/tools/designer/src/lib/shared/filterwidget.cpp +++ b/tools/designer/src/lib/shared/filterwidget.cpp @@ -163,7 +163,7 @@ FilterWidget::FilterWidget(QWidget *parent, LayoutMode lm) : m_editor->setPlaceholderText(tr("Filter")); // Let the style determine minimum height for our widget - QSize size(ICONBUTTON_SIZE + 2, ICONBUTTON_SIZE + 2); + QSize size(ICONBUTTON_SIZE + 6, ICONBUTTON_SIZE + 2); // Note KDE does not reserve space for the highlight color if (style()->inherits("OxygenStyle")) { -- cgit v0.12 From 58298a5a7316e40fc73054b82a451cd013e237ae Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Tue, 18 May 2010 15:43:36 +0200 Subject: Some more 4.7.0 changes --- dist/changes-4.7.0 | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0 index ea6df7b..4775cc1 100644 --- a/dist/changes-4.7.0 +++ b/dist/changes-4.7.0 @@ -68,6 +68,9 @@ QtGui * Fixed a bug that would cause keyboard searches not to behave properly when used within 400 milliseconds of midnight. + - QComboBox + * [QTBUG-8796] Made ForegroundRole work for all styles. + - QPrinter * Obsoleted the slightly confusing setNumCopies() and numCopies() functions, and replaced them with setCopyCount(), copyCount() and @@ -123,9 +126,16 @@ QtGui operators (intersect, subtract, unite) to prevent numerical stability issues. + - QPlastiqueStyle + * [QTBUG-6516] Respect AlternateBase role for list views. + - QRegion * [QTBUG-7699] Fixed crash caused by large x-coordinates. + - QSplitter + * [QTBUG-9335] Improve support for 1-pixel splitters by using a + larger drag area. + - QTransform * [QTBUG-8557] Fixed bug in QTransform::type() potentially occuring after using operator/ or operator* or their overloads. @@ -194,10 +204,13 @@ Qt Plugins Qt for Linux/X11 ---------------- - + - QGtkStyle + * Fixed rtl issues with sliders (QTBUG-8986) + * Fixed missing pressed appearance on scroll bar handles. (QTBUG-10396) Qt for Windows -------------- + - Popup windows now implicitly activate when shown. (QTBUG-7386) - QLocalSocket * Pipe handle leak fixed, when closing a QLocalSocket that still has @@ -209,7 +222,9 @@ Qt for Windows Qt for Mac OS X --------------- - + - QMacStyle + * Removed frame around statusbar items. (QTBUG-3574) + * More native appearance of item view headers and frames. (QTBUG-10047) Qt for Embedded Linux --------------------- -- cgit v0.12 From 2102c0eae57881560a5ddd4d3224167730a06d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Tue, 18 May 2010 17:35:14 +0200 Subject: Make sure cursorPositionChanged is emitted when doing undo/redo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Done-by: mae Reviewed-by: Thorbjørn Lindeijer --- src/gui/text/qtextcontrol.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index a2ee659..3d34687 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -747,7 +747,11 @@ void QTextControl::undo() { Q_D(QTextControl); d->repaintSelection(); + const int oldCursorPos = d->cursor.position(); d->doc->undo(&d->cursor); + if (d->cursor.position() != oldCursorPos) + emit cursorPositionChanged(); + emit microFocusChanged(); ensureCursorVisible(); } @@ -755,7 +759,11 @@ void QTextControl::redo() { Q_D(QTextControl); d->repaintSelection(); + const int oldCursorPos = d->cursor.position(); d->doc->redo(&d->cursor); + if (d->cursor.position() != oldCursorPos) + emit cursorPositionChanged(); + emit microFocusChanged(); ensureCursorVisible(); } -- cgit v0.12