Qt Designer: Use "QtProject" in interfaces, organization name.

Change-Id: Ie278839ede86970a3dfd84d3d34eaf381b528bf5
Reviewed-by: hjk <qthjk@ovi.com>

diff --git a/src/designer/src/components/formeditor/formeditor.qrc b/src/designer/src/components/formeditor/formeditor.qrc
index 6cf0c20..4927290 100644 (file)
--- a/src/designer/src/components/formeditor/formeditor.qrc
+++ b/src/designer/src/components/formeditor/formeditor.qrc
@@ -169,7 +169,7 @@
     <file>images/mac/textsubscript.png</file>
     <file>images/mac/simplifyrichtext.png</file>
   </qresource>
-  <qresource prefix="/trolltech/brushes">
+  <qresource prefix="/qt-project.org/brushes">
     <file>defaultbrushes.xml</file>
   </qresource>
 </RCC>

diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp
index acabf63..4887664 100644 (file)
--- a/src/designer/src/designer/qdesigner.cpp
+++ b/src/designer/src/designer/qdesigner.cpp
@@ -88,7 +88,7 @@ QDesigner::QDesigner(int &argc, char **argv)
       m_client(0),
       m_workbench(0), m_suppressNewFormShow(false)
 {
-    setOrganizationName(QStringLiteral("Trolltech"));
+    setOrganizationName(QStringLiteral("QtProject"));
     setApplicationName(QLatin1String(designerApplicationName));
     QDesignerComponents::initializeResources();
 

diff --git a/src/designer/src/lib/uilib/extension.h b/src/designer/src/lib/uilib/extension.h
index 2788a01..98f99bc 100644 (file)
--- a/src/designer/src/lib/uilib/extension.h
+++ b/src/designer/src/lib/uilib/extension.h
@@ -58,7 +58,7 @@ public:
 
     virtual QObject *extension(QObject *object, const QString &iid) const = 0;
 };
-Q_DECLARE_INTERFACE(QAbstractExtensionFactory, "com.trolltech.Qt.QAbstractExtensionFactory")
+Q_DECLARE_INTERFACE(QAbstractExtensionFactory, "org.qt-project.Qt.QAbstractExtensionFactory")
 
 class QAbstractExtensionManager
 {
@@ -70,7 +70,7 @@ public:
 
     virtual QObject *extension(QObject *object, const QString &iid) const = 0;
 };
-Q_DECLARE_INTERFACE(QAbstractExtensionManager, "com.trolltech.Qt.QAbstractExtensionManager")
+Q_DECLARE_INTERFACE(QAbstractExtensionManager, "org.qt-project.Qt.QAbstractExtensionManager")
 
 #if defined(Q_CC_MSVC) && (_MSC_VER < 1300)