Use "qt-project.org" instead of "trolltech" in the resource system

Task-number: QTBUG-23272
Change-Id: I383e66291fc2c5bb431792c1b93a152a9b02462e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

7 files changed, 12 insertions, 12 deletions

diff --git a/src/designer/src/lib/sdk/abstractformeditor.cpp b/src/designer/src/lib/sdk/abstractformeditor.cpp
index cc56cf7c6..f0e478921 100644
--- a/src/designer/src/lib/sdk/abstractformeditor.cpp
+++ b/src/designer/src/lib/sdk/abstractformeditor.cpp
@@ -560,9 +560,9 @@ void QDesignerFormEditorInterface::setIntrospection(QDesignerIntrospectionInterf
 QString QDesignerFormEditorInterface::resourceLocation() const
 {
 #ifdef Q_OS_MAC
-    return QStringLiteral(":/trolltech/formeditor/images/mac");
+    return QStringLiteral(":/qt-project.org/formeditor/images/mac");
 #else
-    return QStringLiteral(":/trolltech/formeditor/images/win");
+    return QStringLiteral(":/qt-project.org/formeditor/images/win");
 #endif
 }
 
diff --git a/src/designer/src/lib/sdk/abstractintegration.cpp b/src/designer/src/lib/sdk/abstractintegration.cpp
index 4627d9bcf..b86de92dc 100644
--- a/src/designer/src/lib/sdk/abstractintegration.cpp
+++ b/src/designer/src/lib/sdk/abstractintegration.cpp
@@ -384,7 +384,7 @@ void QDesignerIntegrationPrivate::initialize()
         QtGradientUtils::restoreState(m_gradientManager, QString::fromAscii(f.readAll()));
         f.close();
     } else {
-        QFile defaultGradients(QStringLiteral(":/trolltech/designer/defaultgradients.xml"));
+        QFile defaultGradients(QStringLiteral(":/qt-project.org/designer/defaultgradients.xml"));
         if (defaultGradients.open(QIODevice::ReadOnly)) {
             QtGradientUtils::restoreState(m_gradientManager, QString::fromAscii(defaultGradients.readAll()));
             defaultGradients.close();
diff --git a/src/designer/src/lib/shared/iconloader.cpp b/src/designer/src/lib/shared/iconloader.cpp
index 6ad830850..5202f1ad0 100644
--- a/src/designer/src/lib/shared/iconloader.cpp
+++ b/src/designer/src/lib/shared/iconloader.cpp
@@ -52,13 +52,13 @@ namespace qdesigner_internal {
 QDESIGNER_SHARED_EXPORT QIcon createIconSet(const QString &name)
 {
     QStringList candidates = QStringList()
-        << (QString::fromUtf8(":/trolltech/formeditor/images/") + name)
+        << (QString::fromUtf8(":/qt-project.org/formeditor/images/") + name)
 #ifdef Q_OS_MAC
-        << (QString::fromUtf8(":/trolltech/formeditor/images/mac/") + name)
+        << (QString::fromUtf8(":/qt-project.org/formeditor/images/mac/") + name)
 #else
-        << (QString::fromUtf8(":/trolltech/formeditor/images/win/") + name)
+        << (QString::fromUtf8(":/qt-project.org/formeditor/images/win/") + name)
 #endif
-        << (QString::fromUtf8(":/trolltech/formeditor/images/designer_") + name);
+        << (QString::fromUtf8(":/qt-project.org/formeditor/images/designer_") + name);
 
     foreach (const QString &f, candidates) {
         if (QFile::exists(f))
@@ -70,7 +70,7 @@ QDESIGNER_SHARED_EXPORT QIcon createIconSet(const QString &name)
 
 QDESIGNER_SHARED_EXPORT QIcon emptyIcon()
 {
-    return QIcon(QStringLiteral(":/trolltech/formeditor/images/emptyicon.png"));
+    return QIcon(QStringLiteral(":/qt-project.org/formeditor/images/emptyicon.png"));
 }
 
 } // namespace qdesigner_internal
diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp
index 900448dec..e7f06f1ac 100644
--- a/src/designer/src/lib/shared/newformwidget.cpp
+++ b/src/designer/src/lib/shared/newformwidget.cpp
@@ -150,7 +150,7 @@ NewFormWidget::NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parent
     QDesignerSharedSettings settings(m_core);
 
     QString uiExtension = QStringLiteral("ui");
-    QString templatePath = QStringLiteral(":/trolltech/designer/templates/forms");
+    QString templatePath = QStringLiteral(":/qt-project.org/designer/templates/forms");
 
     QDesignerLanguageExtension *lang = qt_extension<QDesignerLanguageExtension *>(core->extensionManager(), core);
     if (lang) {
diff --git a/src/designer/src/lib/shared/plugindialog.cpp b/src/designer/src/lib/shared/plugindialog.cpp
index f5876a62d..1528ae541 100644
--- a/src/designer/src/lib/shared/plugindialog.cpp
+++ b/src/designer/src/lib/shared/plugindialog.cpp
@@ -144,7 +144,7 @@ void PluginDialog::populateTreeWidget()
 QIcon PluginDialog::pluginIcon(const QIcon &icon)
 {
     if (icon.isNull())
-        return QIcon(QStringLiteral(":/trolltech/formeditor/images/qtlogo.png"));
+        return QIcon(QStringLiteral(":/qt-project.org/formeditor/images/qtlogo.png"));
 
     return icon;
 }
diff --git a/src/designer/src/lib/shared/qdesigner_menu.cpp b/src/designer/src/lib/shared/qdesigner_menu.cpp
index 582f33060..6fedff014 100644
--- a/src/designer/src/lib/shared/qdesigner_menu.cpp
+++ b/src/designer/src/lib/shared/qdesigner_menu.cpp
@@ -90,7 +90,7 @@ static inline void extendClickableArea(QRect *subMenuRect, Qt::LayoutDirection d
 
 QDesignerMenu::QDesignerMenu(QWidget *parent) :
     QMenu(parent),
-    m_subMenuPixmap(QPixmap(QStringLiteral(":/trolltech/formeditor/images/submenu.png"))),
+    m_subMenuPixmap(QPixmap(QStringLiteral(":/qt-project.org/formeditor/images/submenu.png"))),
     m_currentIndex(0),
     m_addItem(new SpecialMenuAction(this)),
     m_addSeparator(new SpecialMenuAction(this)),
diff --git a/src/designer/src/lib/shared/shared.qrc b/src/designer/src/lib/shared/shared.qrc
index 81be8076d..734ef391f 100644
--- a/src/designer/src/lib/shared/shared.qrc
+++ b/src/designer/src/lib/shared/shared.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/trolltech/designer">
+    <qresource prefix="/qt-project.org/designer">
         <file>defaultgradients.xml</file>
         <!-- Templates -->
         <file>templates/forms/Dialog_with_Buttons_Bottom.ui</file>