From 178aac93f389ca4ba4e8613214a5acb4384dfd58 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 18 Apr 2012 13:10:42 +0200 Subject: [PATCH] QtTools: Fix compilation after merge of the api_changes branch. Remove Qt::LogText, fix phonon plugin. Change-Id: If51bab691d14d7caae102b60196b2d8c5b07da70 Reviewed-by: Kent Hansen --- src/designer/src/lib/shared/richtexteditor.cpp | 1 - src/designer/src/plugins/phononwidgets/phononcollection.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp index 1918220..f244871 100644 --- a/src/designer/src/lib/shared/richtexteditor.cpp +++ b/src/designer/src/lib/shared/richtexteditor.cpp @@ -731,7 +731,6 @@ void RichTextEditor::setDefaultFont(QFont font) QString RichTextEditor::text(Qt::TextFormat format) const { switch (format) { - case Qt::LogText: case Qt::PlainText: return toPlainText(); case Qt::RichText: diff --git a/src/designer/src/plugins/phononwidgets/phononcollection.cpp b/src/designer/src/plugins/phononwidgets/phononcollection.cpp index e48313d..5400ed9 100644 --- a/src/designer/src/plugins/phononwidgets/phononcollection.cpp +++ b/src/designer/src/plugins/phononwidgets/phononcollection.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE class PhononCollection: public QObject, public QDesignerCustomWidgetCollectionInterface { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface" FILE "phonon.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface" FILE "phononwidgets.json") Q_INTERFACES(QDesignerCustomWidgetCollectionInterface) public: explicit PhononCollection(QObject *parent = 0); -- 2.7.4