From d2246104b4c38cdea4c4c11a7ad715312455f368 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 17 May 2010 09:37:13 +0200 Subject: Changelog: Added Designer/uic3 changes for 4.7.0. --- dist/changes-4.7.0 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0 index 1e3a69c..41fe9d2 100644 --- a/dist/changes-4.7.0 +++ b/dist/changes-4.7.0 @@ -233,7 +233,16 @@ Qt for Windows CE - Designer - + - [QTBUG-9351] Fixed a bug that caused modified headerview-properties + of item views to be duplicated in the UI-file. + - [QTBUG-8347] Fixed a layout problem caused by embedded images in the rich + text of a QLabel. + - [QTBUG-8041], [QTBUG-8213] Fixed a crash related to undo while moving + widgets by arrow keys. + - [QTBUG-7822] Added support for the 'windowOpacity'-property. + - [QTBUG-7764] Fixed the emission of the propertyChanged()-signal of + QDesignerPropertyEditorInterface. + - [QTBUG-5492] Made widgetbox-filter match on class names, too. - Linguist - Linguist GUI @@ -251,9 +260,10 @@ Qt for Windows CE - uic - - uic3 + - [QTBUG-9207] Fixed export of image files of type XPM, added + compatibility option -limit-xpm-linelength. - qmake -- cgit v0.12 From cb3d2252eaacf35a5b3c76eaa884ab4b46af74dd Mon Sep 17 00:00:00 2001 From: ck Date: Mon, 17 May 2010 15:45:56 +0200 Subject: Compile fixes. --- .../qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro | 13 +++++++++++++ .../qgraphicslayouts/graphicsLayouts/graphicslayouts.pro | 13 ------------- examples/graphicsview/padnavigator/padnavigator.h | 4 ++++ src/declarative/qml/qdeclarativeengine_p.h | 1 + 4 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro new file mode 100644 index 0000000..e5d91b2 --- /dev/null +++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro @@ -0,0 +1,13 @@ +TEMPLATE = app +TARGET = graphicslayouts +QT += declarative + +SOURCES += \ + graphicslayouts.cpp \ + main.cpp + +HEADERS += \ + graphicslayouts_p.h + +RESOURCES += \ + graphicslayouts.qrc diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro deleted file mode 100644 index e5d91b2..0000000 --- a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = graphicslayouts -QT += declarative - -SOURCES += \ - graphicslayouts.cpp \ - main.cpp - -HEADERS += \ - graphicslayouts_p.h - -RESOURCES += \ - graphicslayouts.qrc diff --git a/examples/graphicsview/padnavigator/padnavigator.h b/examples/graphicsview/padnavigator/padnavigator.h index 03a1ea2..d9298ae 100644 --- a/examples/graphicsview/padnavigator/padnavigator.h +++ b/examples/graphicsview/padnavigator/padnavigator.h @@ -45,10 +45,14 @@ #include #include "ui_form.h" +QT_BEGIN_NAMESPACE + class QState; class QStateMachine; class Ui_Form; +QT_END_NAMESPACE + //! [0] class PadNavigator : public QGraphicsView { diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 531ac97..0b1c17d 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -91,6 +91,7 @@ class QDeclarativeEngine; class QDeclarativeContextPrivate; class QDeclarativeExpression; class QDeclarativeContextScriptClass; +class QDeclarativeImportDatabase; class QDeclarativeObjectScriptClass; class QDeclarativeTypeNameScriptClass; class QDeclarativeValueTypeScriptClass; -- cgit v0.12 From 25dd6dfe1c7c78370e7cbb266234f6ec5cf0eb95 Mon Sep 17 00:00:00 2001 From: kh1 Date: Mon, 17 May 2010 15:56:58 +0200 Subject: Assistant has unnecessary repaints when expand/collapse selected node. Task-number: QTBUG-10575 Reviewed-by: ck --- tools/assistant/tools/assistant/contentwindow.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/assistant/tools/assistant/contentwindow.cpp b/tools/assistant/tools/assistant/contentwindow.cpp index e0347c8..8afa1df 100644 --- a/tools/assistant/tools/assistant/contentwindow.cpp +++ b/tools/assistant/tools/assistant/contentwindow.cpp @@ -133,11 +133,13 @@ bool ContentWindow::eventFilter(QObject *o, QEvent *e) if (m_contentWidget && o == m_contentWidget->viewport() && e->type() == QEvent::MouseButtonRelease) { QMouseEvent *me = static_cast(e); - QModelIndex index = m_contentWidget->indexAt(me->pos()); - QItemSelectionModel *sm = m_contentWidget->selectionModel(); + const QModelIndex &index = m_contentWidget->indexAt(me->pos()); + if (!index.isValid()) + return QWidget::eventFilter(o, e); - Qt::MouseButtons button = me->button(); - if (index.isValid() && (sm && sm->isSelected(index))) { + const Qt::MouseButtons button = me->button(); + QItemSelectionModel *sm = m_contentWidget->selectionModel(); + if (sm->isSelected(index)) { if ((button == Qt::LeftButton && (me->modifiers() & Qt::ControlModifier)) || (button == Qt::MidButton)) { QHelpContentModel *contentModel = @@ -189,9 +191,11 @@ void ContentWindow::itemClicked(const QModelIndex &index) qobject_cast(m_contentWidget->model()); if (contentModel) { - QHelpContentItem *itm = contentModel->contentItemAt(index); - if (itm) - emit linkActivated(itm->url()); + if (QHelpContentItem *itm = contentModel->contentItemAt(index)) { + const QUrl &url = itm->url(); + if (url != CentralWidget::instance()->currentSource()) + emit linkActivated(url); + } } } -- cgit v0.12 From 6b5a7e8f4f33eaa6b5addca595d58f1dd4a32e7a Mon Sep 17 00:00:00 2001 From: kh1 Date: Mon, 17 May 2010 15:58:44 +0200 Subject: Print icon in doc pages has no effect. Task-number: QTBUG-10579 Reviewed-by: ck --- tools/assistant/tools/assistant/centralwidget.cpp | 1 + tools/assistant/tools/assistant/helpviewer_qwv.cpp | 1 + tools/assistant/tools/assistant/helpviewer_qwv.h | 1 + 3 files changed, 3 insertions(+) diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp index 2359479..131fb85 100644 --- a/tools/assistant/tools/assistant/centralwidget.cpp +++ b/tools/assistant/tools/assistant/centralwidget.cpp @@ -565,6 +565,7 @@ void CentralWidget::connectSignals() SIGNAL(highlighted(QString))); connect(viewer, SIGNAL(sourceChanged(QUrl)), this, SLOT(setTabTitle(QUrl))); + connect(viewer, SIGNAL(printRequested()), this, SLOT(print())); } } diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp index adaa45b..244d091 100644 --- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp +++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp @@ -269,6 +269,7 @@ HelpViewer::HelpViewer(CentralWidget *parent, qreal zoom) SIGNAL(highlighted(QString))); connect(this, SIGNAL(urlChanged(QUrl)), this, SIGNAL(sourceChanged(QUrl))); connect(this, SIGNAL(loadFinished(bool)), this, SLOT(setLoadFinished(bool))); + connect(page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested())); setFont(viewerFont()); setTextSizeMultiplier(zoom == 0.0 ? 1.0 : zoom); diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.h b/tools/assistant/tools/assistant/helpviewer_qwv.h index a2c0389..2577828 100644 --- a/tools/assistant/tools/assistant/helpviewer_qwv.h +++ b/tools/assistant/tools/assistant/helpviewer_qwv.h @@ -100,6 +100,7 @@ Q_SIGNALS: void backwardAvailable(bool enabled); void highlighted(const QString &); void sourceChanged(const QUrl &); + void printRequested(); protected: virtual void wheelEvent(QWheelEvent *); -- cgit v0.12 From 672c0d15ad07aaffeb7354e9fd8a822ee0d36ac2 Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Thu, 6 May 2010 08:39:00 +0200 Subject: Fix a small typo in assistant manual: hompage -> homepage --- doc/src/development/assistant-manual.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/development/assistant-manual.qdoc b/doc/src/development/assistant-manual.qdoc index 7d56ea1..afc6361 100644 --- a/doc/src/development/assistant-manual.qdoc +++ b/doc/src/development/assistant-manual.qdoc @@ -359,7 +359,7 @@ The \menu{Options} page lets you specify the homepage \QA will display when you click the \gui{Home} button in \QA's main user interface. You can specify - the hompage by typing it here or clicking on one of the buttons below the + the homepage by typing it here or clicking on one of the buttons below the textbox. \gui{Current Page} sets the currently displayed page as your home page while \gui{Restore to default} will reset your home page to the default home page. -- cgit v0.12