summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2012-03-26 09:29:47 +0200
committerQt by Nokia <qt-info@nokia.com>2012-03-28 10:02:15 +0200
commitb97b090d620a23736d4ab5535000ce499509cac5 (patch)
tree97d6be459eaf77c5e2bbfda49bea626d72938c79 /src
parent180e84ad39cf135d5facbd43e9ea3be830b2fe1f (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')
-rw-r--r--src/assistant/assistant/assistant.qrc2
-rw-r--r--src/assistant/assistant/assistant_images.qrc2
-rw-r--r--src/assistant/assistant/bookmarkmodel.cpp2
-rw-r--r--src/assistant/assistant/findwidget.cpp4
-rw-r--r--src/assistant/assistant/globalactions.cpp2
-rw-r--r--src/assistant/assistant/mainwindow.cpp8
-rw-r--r--src/assistant/assistant/openpageswidget.cpp4
-rw-r--r--src/assistant/help/helpsystem.qrc2
-rw-r--r--src/assistant/help/qhelpsearchresultwidget.cpp8
-rw-r--r--src/assistant/qhelpconverter/conversionwizard.cpp4
-rw-r--r--src/assistant/qhelpconverter/helpwindow.cpp2
-rw-r--r--src/assistant/qhelpconverter/qhelpconverter.qrc2
-rw-r--r--src/designer/src/components/formeditor/formeditor.qrc2
-rw-r--r--src/designer/src/components/lib/qdesigner_components.cpp2
-rw-r--r--src/designer/src/components/propertyeditor/fontpropertymanager.cpp2
-rw-r--r--src/designer/src/components/propertyeditor/propertyeditor.qrc2
-rw-r--r--src/designer/src/components/widgetbox/widgetbox.qrc2
-rw-r--r--src/designer/src/designer/designer.qrc2
-rw-r--r--src/designer/src/designer/qdesigner.cpp2
-rw-r--r--src/designer/src/designer/versiondialog.cpp2
-rw-r--r--src/designer/src/lib/sdk/abstractformeditor.cpp4
-rw-r--r--src/designer/src/lib/sdk/abstractintegration.cpp2
-rw-r--r--src/designer/src/lib/shared/iconloader.cpp10
-rw-r--r--src/designer/src/lib/shared/newformwidget.cpp2
-rw-r--r--src/designer/src/lib/shared/plugindialog.cpp2
-rw-r--r--src/designer/src/lib/shared/qdesigner_menu.cpp2
-rw-r--r--src/designer/src/lib/shared/shared.qrc2
-rw-r--r--src/designer/src/plugins/phononwidgets/phononwidgets.qrc2
-rw-r--r--src/designer/src/plugins/phononwidgets/seeksliderplugin.cpp2
-rw-r--r--src/designer/src/plugins/phononwidgets/videoplayerplugin.cpp2
-rw-r--r--src/designer/src/plugins/phononwidgets/volumesliderplugin.cpp2
-rw-r--r--src/designer/src/plugins/qwebview/qwebview_plugin.cpp2
-rw-r--r--src/designer/src/plugins/qwebview/qwebview_plugin.qrc2
-rw-r--r--src/qdbus/qdbusviewer/main.cpp2
-rw-r--r--src/qdbus/qdbusviewer/qdbusviewer.cpp2
-rw-r--r--src/qdbus/qdbusviewer/qdbusviewer.qrc2
-rw-r--r--src/qtconfig/mainwindow.cpp2
-rw-r--r--src/qtconfig/qtconfig.qrc2
-rw-r--r--src/shared/findwidget/abstractfindwidget.cpp8
-rw-r--r--src/shared/findwidget/findwidget.qrc2
-rw-r--r--src/shared/qtgradienteditor/qtgradienteditor.cpp12
-rw-r--r--src/shared/qtgradienteditor/qtgradienteditor.qrc2
-rw-r--r--src/shared/qtgradienteditor/qtgradientstopscontroller.cpp4
-rw-r--r--src/shared/qtgradienteditor/qtgradientview.cpp6
-rw-r--r--src/shared/qtpropertybrowser/qtpropertybrowser.qrc2
-rw-r--r--src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp36
-rw-r--r--src/shared/qttoolbardialog/qttoolbardialog.cpp12
-rw-r--r--src/shared/qttoolbardialog/qttoolbardialog.qrc2
48 files changed, 95 insertions, 95 deletions
diff --git a/src/assistant/assistant/assistant.qrc b/src/assistant/assistant/assistant.qrc
index dddf1be75..568ecffe7 100644
--- a/src/assistant/assistant/assistant.qrc
+++ b/src/assistant/assistant/assistant.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/trolltech/assistant" >
+ <qresource prefix="/qt-project.org/assistant" >
<file>assistant.qch</file>
</qresource>
</RCC>
diff --git a/src/assistant/assistant/assistant_images.qrc b/src/assistant/assistant/assistant_images.qrc
index 24f5f1a91..4596b568d 100644
--- a/src/assistant/assistant/assistant_images.qrc
+++ b/src/assistant/assistant/assistant_images.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/trolltech/assistant">
+ <qresource prefix="/qt-project.org/assistant">
<file>images/qt-logo.png</file>
<file>images/assistant-128.png</file>
<file>images/assistant.png</file>
diff --git a/src/assistant/assistant/bookmarkmodel.cpp b/src/assistant/assistant/bookmarkmodel.cpp
index f65b2b1f9..e232f2983 100644
--- a/src/assistant/assistant/bookmarkmodel.cpp
+++ b/src/assistant/assistant/bookmarkmodel.cpp
@@ -85,7 +85,7 @@ BookmarkModel::setBookmarks(const QByteArray &bookmarks)
delete rootItem;
folderIcon = QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon);
- bookmarkIcon = QIcon(QLatin1String(":/trolltech/assistant/images/bookmark.png"));
+ bookmarkIcon = QIcon(QLatin1String(":/qt-project.org/assistant/images/bookmark.png"));
rootItem = new BookmarkItem(DataVector() << tr("Name") << tr("Address")
<< true);
diff --git a/src/assistant/assistant/findwidget.cpp b/src/assistant/assistant/findwidget.cpp
index 4a94a02c9..ec7b441fc 100644
--- a/src/assistant/assistant/findwidget.cpp
+++ b/src/assistant/assistant/findwidget.cpp
@@ -59,7 +59,7 @@ FindWidget::FindWidget(QWidget *parent)
TRACE_OBJ
installEventFilter(this);
QHBoxLayout *hboxLayout = new QHBoxLayout(this);
- QString resourcePath = QLatin1String(":/trolltech/assistant/images/");
+ QString resourcePath = QLatin1String(":/qt-project.org/assistant/images/");
#ifndef Q_OS_MAC
hboxLayout->setMargin(0);
@@ -102,7 +102,7 @@ FindWidget::FindWidget(QWidget *parent)
labelWrapped->setMinimumSize(QSize(0, 20));
labelWrapped->setMaximumSize(QSize(105, 20));
labelWrapped->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter);
- labelWrapped->setText(tr("<img src=\":/trolltech/assistant/images/wrap.png\""
+ labelWrapped->setText(tr("<img src=\":/qt-project.org/assistant/images/wrap.png\""
">&nbsp;Search wrapped"));
hboxLayout->addWidget(labelWrapped);
diff --git a/src/assistant/assistant/globalactions.cpp b/src/assistant/assistant/globalactions.cpp
index 23759efc5..cf22125fe 100644
--- a/src/assistant/assistant/globalactions.cpp
+++ b/src/assistant/assistant/globalactions.cpp
@@ -65,7 +65,7 @@ GlobalActions::GlobalActions(QObject *parent) : QObject(parent)
TRACE_OBJ
// TODO: Put resource path in misc class
- QString resourcePath = QLatin1String(":/trolltech/assistant/images/");
+ QString resourcePath = QLatin1String(":/qt-project.org/assistant/images/");
#ifdef Q_OS_MAC
resourcePath.append(QLatin1String("mac"));
#else
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index ce75a8865..4b5788f1f 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -194,7 +194,7 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
QIcon appIcon(pix);
qApp->setWindowIcon(appIcon);
} else {
- QIcon appIcon(QLatin1String(":/trolltech/assistant/images/assistant-128.png"));
+ QIcon appIcon(QLatin1String(":/qt-project.org/assistant/images/assistant-128.png"));
qApp->setWindowIcon(appIcon);
}
@@ -346,7 +346,7 @@ bool MainWindow::initHelpDB(bool registerInternalDoc)
if (!assistantInternalDocRegistered || !QFile::exists(helpFile)) {
QFile file(helpFile);
if (file.open(QIODevice::WriteOnly)) {
- QResource res(QLatin1String(":/trolltech/assistant/assistant.qch"));
+ QResource res(QLatin1String(":/qt-project.org/assistant/assistant.qch"));
if (file.write((const char*)res.data(), res.size()) != res.size())
qDebug() << QLatin1String("could not write assistant.qch...");
@@ -431,7 +431,7 @@ void MainWindow::insertLastPages()
void MainWindow::setupActions()
{
TRACE_OBJ
- QString resourcePath = QLatin1String(":/trolltech/assistant/images/");
+ QString resourcePath = QLatin1String(":/qt-project.org/assistant/images/");
#ifdef Q_OS_MAC
setUnifiedTitleAndToolBarOnMac(true);
resourcePath.append(QLatin1String("mac"));
@@ -812,7 +812,7 @@ void MainWindow::showAboutDialog()
"<p>Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).</p>")
.arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR)),
resources);
- QLatin1String path(":/trolltech/assistant/images/assistant-128.png");
+ QLatin1String path(":/qt-project.org/assistant/images/assistant-128.png");
aboutDia.setPixmap(QString(path));
}
if (aboutDia.windowTitle().isEmpty())
diff --git a/src/assistant/assistant/openpageswidget.cpp b/src/assistant/assistant/openpageswidget.cpp
index 11e3670f7..57d1a8209 100644
--- a/src/assistant/assistant/openpageswidget.cpp
+++ b/src/assistant/assistant/openpageswidget.cpp
@@ -78,8 +78,8 @@ void OpenPagesDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt
if (index.column() == 1 && index.model()->rowCount() > 1
&& option.state & QStyle::State_MouseOver) {
QIcon icon((option.state & QStyle::State_Selected)
- ? ":/trolltech/assistant/images/closebutton.png"
- : ":/trolltech/assistant/images/darkclosebutton.png");
+ ? ":/qt-project.org/assistant/images/closebutton.png"
+ : ":/qt-project.org/assistant/images/darkclosebutton.png");
const QRect iconRect(option.rect.right() - option.rect.height(),
option.rect.top(), option.rect.height(), option.rect.height());
diff --git a/src/assistant/help/helpsystem.qrc b/src/assistant/help/helpsystem.qrc
index 10efc6df1..785923aad 100644
--- a/src/assistant/help/helpsystem.qrc
+++ b/src/assistant/help/helpsystem.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/trolltech/assistant" >
+ <qresource prefix="/qt-project.org/assistant" >
<file>images/1leftarrow.png</file>
<file>images/1rightarrow.png</file>
<file>images/3leftarrow.png</file>
diff --git a/src/assistant/help/qhelpsearchresultwidget.cpp b/src/assistant/help/qhelpsearchresultwidget.cpp
index e647ec388..35366fce2 100644
--- a/src/assistant/help/qhelpsearchresultwidget.cpp
+++ b/src/assistant/help/qhelpsearchresultwidget.cpp
@@ -360,10 +360,10 @@ QHelpSearchResultWidget::QHelpSearchResultWidget(QHelpSearchEngine *engine)
hBoxLayout->setSpacing(0);
#endif
hBoxLayout->addWidget(d->firstResultPage = d->setupToolButton(
- QString::fromUtf8(":/trolltech/assistant/images/3leftarrow.png")));
+ QString::fromUtf8(":/qt-project.org/assistant/images/3leftarrow.png")));
hBoxLayout->addWidget(d->previousResultPage = d->setupToolButton(
- QString::fromUtf8(":/trolltech/assistant/images/1leftarrow.png")));
+ QString::fromUtf8(":/qt-project.org/assistant/images/1leftarrow.png")));
d->hitsLabel = new QLabel(tr("0 - 0 of 0 Hits"), this);
d->hitsLabel->setEnabled(false);
@@ -372,10 +372,10 @@ QHelpSearchResultWidget::QHelpSearchResultWidget(QHelpSearchEngine *engine)
d->hitsLabel->setMinimumSize(QSize(150, d->hitsLabel->height()));
hBoxLayout->addWidget(d->nextResultPage = d->setupToolButton(
- QString::fromUtf8(":/trolltech/assistant/images/1rightarrow.png")));
+ QString::fromUtf8(":/qt-project.org/assistant/images/1rightarrow.png")));
hBoxLayout->addWidget(d->lastResultPage = d->setupToolButton(
- QString::fromUtf8(":/trolltech/assistant/images/3rightarrow.png")));
+ QString::fromUtf8(":/qt-project.org/assistant/images/3rightarrow.png")));
QSpacerItem *spacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
hBoxLayout->addItem(spacer);
diff --git a/src/assistant/qhelpconverter/conversionwizard.cpp b/src/assistant/qhelpconverter/conversionwizard.cpp
index 10d424311..27695cf91 100644
--- a/src/assistant/qhelpconverter/conversionwizard.cpp
+++ b/src/assistant/qhelpconverter/conversionwizard.cpp
@@ -63,10 +63,10 @@ QT_BEGIN_NAMESPACE
ConversionWizard::ConversionWizard()
{
- setWindowIcon(QIcon(QLatin1String(":/trolltech/qhelpconverter/assistant.png")));
+ setWindowIcon(QIcon(QLatin1String(":/qt-project.org/qhelpconverter/assistant.png")));
setWindowTitle(tr("Help Conversion Wizard"));
setPixmap(QWizard::WatermarkPixmap,
- QPixmap(QLatin1String(":/trolltech/qhelpconverter/assistant-128.png"))) ;
+ QPixmap(QLatin1String(":/qt-project.org/qhelpconverter/assistant-128.png"))) ;
setOptions(QWizard::IndependentPages|QWizard::NoBackButtonOnLastPage
|QWizard::HaveHelpButton);
diff --git a/src/assistant/qhelpconverter/helpwindow.cpp b/src/assistant/qhelpconverter/helpwindow.cpp
index 8bde4d823..398e6984d 100644
--- a/src/assistant/qhelpconverter/helpwindow.cpp
+++ b/src/assistant/qhelpconverter/helpwindow.cpp
@@ -74,7 +74,7 @@ HelpWindow::HelpWindow(QWidget *parent)
void HelpWindow::setHelp(const QString &topic)
{
- QLatin1String fileStr(":/trolltech/qhelpconverter/doc/%1.html");
+ QLatin1String fileStr(":/qt-project.org/qhelpconverter/doc/%1.html");
QFile f(QString(fileStr).arg(topic.toLower()));
f.open(QIODevice::ReadOnly);
QTextStream s(&f);
diff --git a/src/assistant/qhelpconverter/qhelpconverter.qrc b/src/assistant/qhelpconverter/qhelpconverter.qrc
index e2a68ab43..982ac7d9c 100644
--- a/src/assistant/qhelpconverter/qhelpconverter.qrc
+++ b/src/assistant/qhelpconverter/qhelpconverter.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/trolltech/qhelpconverter" >
+ <qresource prefix="/qt-project.org/qhelpconverter" >
<file>assistant-128.png</file>
<file>assistant.png</file>
<file>doc/inputpage.html</file>
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>
diff --git a/src/qdbus/qdbusviewer/main.cpp b/src/qdbus/qdbusviewer/main.cpp
index 1e440e00c..d42e27142 100644
--- a/src/qdbus/qdbusviewer/main.cpp
+++ b/src/qdbus/qdbusviewer/main.cpp
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
QMainWindow mw;
#ifndef Q_OS_MAC
- app.setWindowIcon(QIcon(QLatin1String(":/trolltech/qdbusviewer/images/qdbusviewer.png")));
+ app.setWindowIcon(QIcon(QLatin1String(":/qt-project.org/qdbusviewer/images/qdbusviewer.png")));
#else
mw.setWindowTitle(qApp->translate("QtDBusViewer", "Qt D-Bus Viewer"));
#endif
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp
index 588d76d53..8eb4fc5a0 100644
--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -489,7 +489,7 @@ void QDBusViewer::about()
{
QMessageBox box(this);
- box.setText(QString::fromLatin1("<center><img src=\":/trolltech/qdbusviewer/images/qdbusviewer-128.png\">"
+ box.setText(QString::fromLatin1("<center><img src=\":/qt-project.org/qdbusviewer/images/qdbusviewer-128.png\">"
"<h3>%1</h3>"
"<p>Version %2</p></center>"
"<p>Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).</p>")
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.qrc b/src/qdbus/qdbusviewer/qdbusviewer.qrc
index 7d592f32c..8be6643bc 100644
--- a/src/qdbus/qdbusviewer/qdbusviewer.qrc
+++ b/src/qdbus/qdbusviewer/qdbusviewer.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/trolltech/qdbusviewer" >
+ <qresource prefix="/qt-project.org/qdbusviewer" >
<file>images/qdbusviewer-128.png</file>
<file>images/qdbusviewer.png</file>
</qresource>
diff --git a/src/qtconfig/mainwindow.cpp b/src/qtconfig/mainwindow.cpp
index 6d932815b..422c2e24c 100644
--- a/src/qtconfig/mainwindow.cpp
+++ b/src/qtconfig/mainwindow.cpp
@@ -230,7 +230,7 @@ MainWindow::MainWindow()
modified = true;
desktopThemeName = tr("Desktop Settings (Default)");
- setWindowIcon(QPixmap(":/trolltech/qtconfig/images/appicon.png"));
+ setWindowIcon(QPixmap(":/qt-project.org/qtconfig/images/appicon.png"));
QStringList gstyles = QStyleFactory::keys();
gstyles.sort();
ui->guiStyleCombo->addItem(desktopThemeName);
diff --git a/src/qtconfig/qtconfig.qrc b/src/qtconfig/qtconfig.qrc
index cd6656727..3fc8f9dee 100644
--- a/src/qtconfig/qtconfig.qrc
+++ b/src/qtconfig/qtconfig.qrc
@@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/trolltech/qtconfig/">
+<qresource prefix="/qt-project.org/qtconfig/">
<file>images/appicon.png</file>
</qresource>
</RCC>
diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp
index c998fe01e..94343a736 100644
--- a/src/shared/findwidget/abstractfindwidget.cpp
+++ b/src/shared/findwidget/abstractfindwidget.cpp
@@ -72,11 +72,11 @@ QT_BEGIN_NAMESPACE
static QIcon createIconSet(const QString &name)
{
QStringList candidates = QStringList()
- << (QString::fromUtf8(":/trolltech/shared/images/") + name)
+ << (QString::fromUtf8(":/qt-project.org/shared/images/") + name)
#ifdef Q_OS_MAC
- << (QString::fromUtf8(":/trolltech/shared/images/mac/") + name);
+ << (QString::fromUtf8(":/qt-project.org/shared/images/mac/") + name);
#else
- << (QString::fromUtf8(":/trolltech/shared/images/win/") + name);
+ << (QString::fromUtf8(":/qt-project.org/shared/images/win/") + name);
#endif
foreach (const QString &f, candidates) {
@@ -176,7 +176,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent)
m_labelWrapped->setAlignment(
Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter);
m_labelWrapped->setText(
- tr("<img src=\":/trolltech/shared/images/wrap.png\">"
+ tr("<img src=\":/qt-project.org/shared/images/wrap.png\">"
"&nbsp;Search wrapped"));
m_labelWrapped->hide();
layOut->addWidget(m_labelWrapped);
diff --git a/src/shared/findwidget/findwidget.qrc b/src/shared/findwidget/findwidget.qrc
index 1d45b25dd..8abc2d8e9 100644
--- a/src/shared/findwidget/findwidget.qrc
+++ b/src/shared/findwidget/findwidget.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/trolltech/shared">
+ <qresource prefix="/qt-project.org/shared">
<file>images/mac/closetab.png</file>
<file>images/mac/next.png</file>
<file>images/mac/previous.png</file>
diff --git a/src/shared/qtgradienteditor/qtgradienteditor.cpp b/src/shared/qtgradienteditor/qtgradienteditor.cpp
index 0d030681f..79caaa02a 100644
--- a/src/shared/qtgradienteditor/qtgradienteditor.cpp
+++ b/src/shared/qtgradienteditor/qtgradienteditor.cpp
@@ -763,9 +763,9 @@ QtGradientEditor::QtGradientEditor(QWidget *parent)
connect(d_ptr->m_gradientStopsController, SIGNAL(gradientStopsChanged(QGradientStops)),
this, SLOT(slotGradientStopsChanged(QGradientStops)));
- QIcon iconLinear(QLatin1String(":/trolltech/qtgradienteditor/images/typelinear.png"));
- QIcon iconRadial(QLatin1String(":/trolltech/qtgradienteditor/images/typeradial.png"));
- QIcon iconConical(QLatin1String(":/trolltech/qtgradienteditor/images/typeconical.png"));
+ QIcon iconLinear(QLatin1String(":/qt-project.org/qtgradienteditor/images/typelinear.png"));
+ QIcon iconRadial(QLatin1String(":/qt-project.org/qtgradienteditor/images/typeradial.png"));
+ QIcon iconConical(QLatin1String(":/qt-project.org/qtgradienteditor/images/typeconical.png"));
d_ptr->m_ui.typeComboBox->addItem(iconLinear, tr("Linear"));
d_ptr->m_ui.typeComboBox->addItem(iconRadial, tr("Radial"));
@@ -785,9 +785,9 @@ QtGradientEditor::QtGradientEditor(QWidget *parent)
connect(d_ptr->m_ui.typeComboBox, SIGNAL(activated(int)),
this, SLOT(slotTypeChanged(int)));
- QIcon iconPad(QLatin1String(":/trolltech/qtgradienteditor/images/spreadpad.png"));
- QIcon iconRepeat(QLatin1String(":/trolltech/qtgradienteditor/images/spreadrepeat.png"));
- QIcon iconReflect(QLatin1String(":/trolltech/qtgradienteditor/images/spreadreflect.png"));
+ QIcon iconPad(QLatin1String(":/qt-project.org/qtgradienteditor/images/spreadpad.png"));
+ QIcon iconRepeat(QLatin1String(":/qt-project.org/qtgradienteditor/images/spreadrepeat.png"));
+ QIcon iconReflect(QLatin1String(":/qt-project.org/qtgradienteditor/images/spreadreflect.png"));
d_ptr->m_ui.spreadComboBox->addItem(iconPad, tr("Pad"));
d_ptr->m_ui.spreadComboBox->addItem(iconRepeat, tr("Repeat"));
diff --git a/src/shared/qtgradienteditor/qtgradienteditor.qrc b/src/shared/qtgradienteditor/qtgradienteditor.qrc
index cce7ba622..74c236202 100644
--- a/src/shared/qtgradienteditor/qtgradienteditor.qrc
+++ b/src/shared/qtgradienteditor/qtgradienteditor.qrc
@@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
- <qresource prefix="/trolltech/qtgradienteditor">
+ <qresource prefix="/qt-project.org/qtgradienteditor">
<file>images/edit.png</file>
<file>images/zoomin.png</file>
<file>images/zoomout.png</file>
diff --git a/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp b/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp
index d0d42acda..13235ea8b 100644
--- a/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp
+++ b/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp
@@ -663,8 +663,8 @@ void QtGradientStopsController::setUi(Ui::QtGradientEditor *ui)
this, SLOT(slotRgbClicked()));
d_ptr->enableCurrent(false);
- d_ptr->m_ui->zoomInButton->setIcon(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/zoomin.png")));
- d_ptr->m_ui->zoomOutButton->setIcon(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/zoomout.png")));
+ d_ptr->m_ui->zoomInButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qtgradienteditor/images/zoomin.png")));
+ d_ptr->m_ui->zoomOutButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qtgradienteditor/images/zoomout.png")));
d_ptr->updateZoom(1);
}
diff --git a/src/shared/qtgradienteditor/qtgradientview.cpp b/src/shared/qtgradienteditor/qtgradientview.cpp
index e0f16b8ef..8885b8506 100644
--- a/src/shared/qtgradienteditor/qtgradientview.cpp
+++ b/src/shared/qtgradienteditor/qtgradientview.cpp
@@ -205,10 +205,10 @@ QtGradientView::QtGradientView(QWidget *parent)
connect(m_ui.listWidget, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(slotRenameGradient(QListWidgetItem*)));
connect(m_ui.listWidget, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(slotCurrentItemChanged(QListWidgetItem*)));
- m_newAction = new QAction(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/plus.png")), tr("New..."), this);
- m_editAction = new QAction(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/edit.png")), tr("Edit..."), this);
+ m_newAction = new QAction(QIcon(QLatin1String(":/qt-project.org/qtgradienteditor/images/plus.png")), tr("New..."), this);
+ m_editAction = new QAction(QIcon(QLatin1String(":/qt-project.org/qtgradienteditor/images/edit.png")), tr("Edit..."), this);
m_renameAction = new QAction(tr("Rename"), this);
- m_removeAction = new QAction(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/minus.png")), tr("Remove"), this);
+ m_removeAction = new QAction(QIcon(QLatin1String(":/qt-project.org/qtgradienteditor/images/minus.png")), tr("Remove"), this);
connect(m_newAction, SIGNAL(triggered()), this, SLOT(slotNewGradient()));
connect(m_editAction, SIGNAL(triggered()), this, SLOT(slotEditGradient()));
diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.qrc b/src/shared/qtpropertybrowser/qtpropertybrowser.qrc
index 4f91ab782..03e9c5612 100644
--- a/src/shared/qtpropertybrowser/qtpropertybrowser.qrc
+++ b/src/shared/qtpropertybrowser/qtpropertybrowser.qrc
@@ -1,5 +1,5 @@
<RCC version="1.0">
- <qresource prefix="/trolltech/qtpropertybrowser">
+ <qresource prefix="/qt-project.org/qtpropertybrowser">
<file>images/cursor-arrow.png</file>
<file>images/cursor-busy.png</file>
<file>images/cursor-closedhand.png</file>
diff --git a/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp b/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
index ee1d9bfad..7ddbbff52 100644
--- a/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
+++ b/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
@@ -54,43 +54,43 @@ QT_BEGIN_NAMESPACE
QtCursorDatabase::QtCursorDatabase()
{
appendCursor(Qt::ArrowCursor, QApplication::translate("QtCursorDatabase", "Arrow", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-arrow.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-arrow.png")));
appendCursor(Qt::UpArrowCursor, QApplication::translate("QtCursorDatabase", "Up Arrow", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-uparrow.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-uparrow.png")));
appendCursor(Qt::CrossCursor, QApplication::translate("QtCursorDatabase", "Cross", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-cross.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-cross.png")));
appendCursor(Qt::WaitCursor, QApplication::translate("QtCursorDatabase", "Wait", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-wait.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-wait.png")));
appendCursor(Qt::IBeamCursor, QApplication::translate("QtCursorDatabase", "IBeam", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-ibeam.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-ibeam.png")));
appendCursor(Qt::SizeVerCursor, QApplication::translate("QtCursorDatabase", "Size Vertical", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-sizev.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-sizev.png")));
appendCursor(Qt::SizeHorCursor, QApplication::translate("QtCursorDatabase", "Size Horizontal", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-sizeh.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-sizeh.png")));
appendCursor(Qt::SizeFDiagCursor, QApplication::translate("QtCursorDatabase", "Size Backslash", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-sizef.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-sizef.png")));
appendCursor(Qt::SizeBDiagCursor, QApplication::translate("QtCursorDatabase", "Size Slash", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-sizeb.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-sizeb.png")));
appendCursor(Qt::SizeAllCursor, QApplication::translate("QtCursorDatabase", "Size All", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-sizeall.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-sizeall.png")));
appendCursor(Qt::BlankCursor, QApplication::translate("QtCursorDatabase", "Blank", 0,
QApplication::UnicodeUTF8), QIcon());
appendCursor(Qt::SplitVCursor, QApplication::translate("QtCursorDatabase", "Split Vertical", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-vsplit.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-vsplit.png")));
appendCursor(Qt::SplitHCursor, QApplication::translate("QtCursorDatabase", "Split Horizontal", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-hsplit.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-hsplit.png")));
appendCursor(Qt::PointingHandCursor, QApplication::translate("QtCursorDatabase", "Pointing Hand", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-hand.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-hand.png")));
appendCursor(Qt::ForbiddenCursor, QApplication::translate("QtCursorDatabase", "Forbidden", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-forbidden.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-forbidden.png")));
appendCursor(Qt::OpenHandCursor, QApplication::translate("QtCursorDatabase", "Open Hand", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-openhand.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-openhand.png")));
appendCursor(Qt::ClosedHandCursor, QApplication::translate("QtCursorDatabase", "Closed Hand", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-closedhand.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-closedhand.png")));
appendCursor(Qt::WhatsThisCursor, QApplication::translate("QtCursorDatabase", "What's This", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-whatsthis.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-whatsthis.png")));
appendCursor(Qt::BusyCursor, QApplication::translate("QtCursorDatabase", "Busy", 0,
- QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-busy.png")));
+ QApplication::UnicodeUTF8), QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-busy.png")));
}
void QtCursorDatabase::clear()
diff --git a/src/shared/qttoolbardialog/qttoolbardialog.cpp b/src/shared/qttoolbardialog/qttoolbardialog.cpp
index f99b23311..2203286ff 100644
--- a/src/shared/qttoolbardialog/qttoolbardialog.cpp
+++ b/src/shared/qttoolbardialog/qttoolbardialog.cpp
@@ -1787,12 +1787,12 @@ QtToolBarDialog::QtToolBarDialog(QWidget *parent, Qt::WindowFlags flags)
d_ptr->ui.actionTree->setRootIsDecorated(false);
d_ptr->ui.actionTree->header()->hide();
- d_ptr->ui.upButton->setIcon(QIcon(QLatin1String(":/trolltech/qttoolbardialog/images/up.png")));
- d_ptr->ui.downButton->setIcon(QIcon(QLatin1String(":/trolltech/qttoolbardialog/images/down.png")));
- d_ptr->ui.leftButton->setIcon(QIcon(QLatin1String(":/trolltech/qttoolbardialog/images/back.png")));
- d_ptr->ui.rightButton->setIcon(QIcon(QLatin1String(":/trolltech/qttoolbardialog/images/forward.png")));
- d_ptr->ui.newButton->setIcon(QIcon(QLatin1String(":/trolltech/qttoolbardialog/images/plus.png")));
- d_ptr->ui.removeButton->setIcon(QIcon(QLatin1String(":/trolltech/qttoolbardialog/images/minus.png")));
+ d_ptr->ui.upButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qttoolbardialog/images/up.png")));
+ d_ptr->ui.downButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qttoolbardialog/images/down.png")));
+ d_ptr->ui.leftButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qttoolbardialog/images/back.png")));
+ d_ptr->ui.rightButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qttoolbardialog/images/forward.png")));
+ d_ptr->ui.newButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qttoolbardialog/images/plus.png")));
+ d_ptr->ui.removeButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qttoolbardialog/images/minus.png")));
connect(d_ptr->ui.newButton, SIGNAL(clicked()), this, SLOT(newClicked()));
connect(d_ptr->ui.removeButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
diff --git a/src/shared/qttoolbardialog/qttoolbardialog.qrc b/src/shared/qttoolbardialog/qttoolbardialog.qrc
index ce0336682..efd3825fa 100644
--- a/src/shared/qttoolbardialog/qttoolbardialog.qrc
+++ b/src/shared/qttoolbardialog/qttoolbardialog.qrc
@@ -1,5 +1,5 @@
<RCC version="1.0">
- <qresource prefix="/trolltech/qttoolbardialog">
+ <qresource prefix="/qt-project.org/qttoolbardialog">
<file>images/up.png</file>
<file>images/down.png</file>
<file>images/forward.png</file>