QtTools: Fix compilation after merge of the api_changes branch.

Remove Qt::LogText, fix phonon plugin.

Change-Id: If51bab691d14d7caae102b60196b2d8c5b07da70
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp
index 1918220..f244871 100644 (file)
--- 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 (file)
--- 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);