diff options
author | hjk <qtc-committer@nokia.com> | 2012-03-26 09:29:47 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-28 10:02:15 +0200 |
commit | b97b090d620a23736d4ab5535000ce499509cac5 (patch) | |
tree | 97d6be459eaf77c5e2bbfda49bea626d72938c79 /src/designer/src | |
parent | 180e84ad39cf135d5facbd43e9ea3be830b2fe1f (diff) |
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>
Diffstat (limited to 'src/designer/src')
21 files changed, 26 insertions, 26 deletions
diff --git a/src/designer/src/components/formeditor/formeditor.qrc b/src/designer/src/components/formeditor/formeditor.qrc index e42cc66ec..6cf0c2090 100644 --- a/src/designer/src/components/formeditor/formeditor.qrc +++ b/src/designer/src/components/formeditor/formeditor.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/trolltech/formeditor"> + <qresource prefix="/qt-project.org/formeditor"> <file>images/submenu.png</file> <file>images/cursors/arrow.png</file> <file>images/cursors/busy.png</file> diff --git a/src/designer/src/components/lib/qdesigner_components.cpp b/src/designer/src/components/lib/qdesigner_components.cpp index 7ee3a3877..131122f39 100644 --- a/src/designer/src/components/lib/qdesigner_components.cpp +++ b/src/designer/src/components/lib/qdesigner_components.cpp @@ -192,7 +192,7 @@ QDesignerWidgetBoxInterface *QDesignerComponents::createWidgetBox(QDesignerFormE } } - widgetBox->setFileName(QStringLiteral(":/trolltech/widgetbox/widgetbox.xml")); + widgetBox->setFileName(QStringLiteral(":/qt-project.org/widgetbox/widgetbox.xml")); widgetBox->load(); } while (false); diff --git a/src/designer/src/components/propertyeditor/fontpropertymanager.cpp b/src/designer/src/components/propertyeditor/fontpropertymanager.cpp index 29adbc552..8a6765132 100644 --- a/src/designer/src/components/propertyeditor/fontpropertymanager.cpp +++ b/src/designer/src/components/propertyeditor/fontpropertymanager.cpp @@ -331,7 +331,7 @@ namespace qdesigner_internal { bool FontPropertyManager::readFamilyMapping(NameMap *rc, QString *errorMessage) { rc->clear(); - const QString fileName = QStringLiteral(":/trolltech/propertyeditor/fontmapping.xml"); + const QString fileName = QStringLiteral(":/qt-project.org/propertyeditor/fontmapping.xml"); QFile file(fileName); if (!file.open(QIODevice::ReadOnly)) { *errorMessage = QString::fromUtf8("Unable to open %1: %2").arg(fileName, file.errorString()); diff --git a/src/designer/src/components/propertyeditor/propertyeditor.qrc b/src/designer/src/components/propertyeditor/propertyeditor.qrc index 68008eca8..6c0dc18ca 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.qrc +++ b/src/designer/src/components/propertyeditor/propertyeditor.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/trolltech/propertyeditor"> + <qresource prefix="/qt-project.org/propertyeditor"> <file>fontmapping.xml</file> </qresource> </RCC> diff --git a/src/designer/src/components/widgetbox/widgetbox.qrc b/src/designer/src/components/widgetbox/widgetbox.qrc index 7ecf78c85..2cac8a95e 100644 --- a/src/designer/src/components/widgetbox/widgetbox.qrc +++ b/src/designer/src/components/widgetbox/widgetbox.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/trolltech/widgetbox"> + <qresource prefix="/qt-project.org/widgetbox"> <file>widgetbox.xml</file> </qresource> </RCC> diff --git a/src/designer/src/designer/designer.qrc b/src/designer/src/designer/designer.qrc index fac8120d0..5de379c78 100644 --- a/src/designer/src/designer/designer.qrc +++ b/src/designer/src/designer/designer.qrc @@ -1,5 +1,5 @@ <!DOCTYPE RCC><RCC version="1.0"> - <qresource prefix="/trolltech/designer"> + <qresource prefix="/qt-project.org/designer"> <file>images/designer.png</file> </qresource> </RCC> diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp index bd154224c..3eb937b7b 100644 --- a/src/designer/src/designer/qdesigner.cpp +++ b/src/designer/src/designer/qdesigner.cpp @@ -93,7 +93,7 @@ QDesigner::QDesigner(int &argc, char **argv) QDesignerComponents::initializeResources(); #ifndef Q_OS_MAC - setWindowIcon(QIcon(QStringLiteral(":/trolltech/designer/images/designer.png"))); + setWindowIcon(QIcon(QStringLiteral(":/qt-project.org/designer/images/designer.png"))); #endif initialize(); } diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp index cebab16c7..4ba0e675c 100644 --- a/src/designer/src/designer/versiondialog.cpp +++ b/src/designer/src/designer/versiondialog.cpp @@ -77,7 +77,7 @@ private: VersionLabel::VersionLabel(QWidget *parent) : QLabel(parent), secondStage(false), m_pushed(false) { - setPixmap(QPixmap(QStringLiteral(":/trolltech/designer/images/designer.png"))); + setPixmap(QPixmap(QStringLiteral(":/qt-project.org/designer/images/designer.png"))); hitPoints.append(QPoint(56, 25)); hitPoints.append(QPoint(29, 55)); hitPoints.append(QPoint(56, 87)); 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> diff --git a/src/designer/src/plugins/phononwidgets/phononwidgets.qrc b/src/designer/src/plugins/phononwidgets/phononwidgets.qrc index aa51330fd..2e1250bbc 100644 --- a/src/designer/src/plugins/phononwidgets/phononwidgets.qrc +++ b/src/designer/src/plugins/phononwidgets/phononwidgets.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/trolltech/phononwidgets"> + <qresource prefix="/qt-project.org/phononwidgets"> <file>images/videoplayer.png</file> <file>images/videowidget.png</file> <file>images/seekslider.png</file> diff --git a/src/designer/src/plugins/phononwidgets/seeksliderplugin.cpp b/src/designer/src/plugins/phononwidgets/seeksliderplugin.cpp index 9f2382697..2721ab88a 100644 --- a/src/designer/src/plugins/phononwidgets/seeksliderplugin.cpp +++ b/src/designer/src/plugins/phononwidgets/seeksliderplugin.cpp @@ -81,7 +81,7 @@ QString SeekSliderPlugin::includeFile() const QIcon SeekSliderPlugin::icon() const { - return QIcon(QStringLiteral(":/trolltech/phononwidgets/images/seekslider.png")); + return QIcon(QStringLiteral(":/qt-project.org/phononwidgets/images/seekslider.png")); } bool SeekSliderPlugin::isContainer() const diff --git a/src/designer/src/plugins/phononwidgets/videoplayerplugin.cpp b/src/designer/src/plugins/phononwidgets/videoplayerplugin.cpp index 7b50b9029..a12484ab2 100644 --- a/src/designer/src/plugins/phononwidgets/videoplayerplugin.cpp +++ b/src/designer/src/plugins/phononwidgets/videoplayerplugin.cpp @@ -87,7 +87,7 @@ QString VideoPlayerPlugin::includeFile() const QIcon VideoPlayerPlugin::icon() const { - return QIcon(QStringLiteral(":/trolltech/phononwidgets/images/videoplayer.png")); + return QIcon(QStringLiteral(":/qt-project.org/phononwidgets/images/videoplayer.png")); } bool VideoPlayerPlugin::isContainer() const diff --git a/src/designer/src/plugins/phononwidgets/volumesliderplugin.cpp b/src/designer/src/plugins/phononwidgets/volumesliderplugin.cpp index cfdcb3fdb..0a19ede2c 100644 --- a/src/designer/src/plugins/phononwidgets/volumesliderplugin.cpp +++ b/src/designer/src/plugins/phononwidgets/volumesliderplugin.cpp @@ -81,7 +81,7 @@ QString VolumeSliderPlugin::includeFile() const QIcon VolumeSliderPlugin::icon() const { - return QIcon(QStringLiteral(":/trolltech/phononwidgets/images/volumeslider.png")); + return QIcon(QStringLiteral(":/qt-project.org/phononwidgets/images/volumeslider.png")); } bool VolumeSliderPlugin::isContainer() const diff --git a/src/designer/src/plugins/qwebview/qwebview_plugin.cpp b/src/designer/src/plugins/qwebview/qwebview_plugin.cpp index e3ac91748..c50fc2bd5 100644 --- a/src/designer/src/plugins/qwebview/qwebview_plugin.cpp +++ b/src/designer/src/plugins/qwebview/qwebview_plugin.cpp @@ -84,7 +84,7 @@ QString QWebViewPlugin::includeFile() const QIcon QWebViewPlugin::icon() const { - return QIcon(QStringLiteral(":/trolltech/qwebview/images/qwebview.png")); + return QIcon(QStringLiteral(":/qt-project.org/qwebview/images/qwebview.png")); } bool QWebViewPlugin::isContainer() const diff --git a/src/designer/src/plugins/qwebview/qwebview_plugin.qrc b/src/designer/src/plugins/qwebview/qwebview_plugin.qrc index a3e2b9016..828cab03c 100644 --- a/src/designer/src/plugins/qwebview/qwebview_plugin.qrc +++ b/src/designer/src/plugins/qwebview/qwebview_plugin.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/trolltech/qwebview"> + <qresource prefix="/qt-project.org/qwebview"> <file>images/qwebview.png</file> </qresource> </RCC> |