diff options
author | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2009-01-12 15:06:43 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2009-01-12 15:23:22 +0100 |
commit | 6c1e557d70a15cea93e1cb59522849b4266e229a (patch) | |
tree | aa4ce1ee7cd15fb82b4f4743bc7a641a8698b7b8 /src/plugins/coreplugin | |
parent | e0eead09977fb2829e72485663e6eab8bbe495b4 (diff) | |
download | qt-creator-6c1e557d70a15cea93e1cb59522849b4266e229a.tar.gz |
Changed coreplugin resource prefix to "/core"
It still read "/qworkbench", the research project name for Qt Creator.
Reviewed-by: con
Diffstat (limited to 'src/plugins/coreplugin')
-rw-r--r-- | src/plugins/coreplugin/basefilewizard.cpp | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/core.qrc | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/coreconstants.h | 42 | ||||
-rw-r--r-- | src/plugins/coreplugin/coreplugin.h | 6 | ||||
-rw-r--r-- | src/plugins/coreplugin/dialogs/shortcutsettings.ui | 4 | ||||
-rw-r--r-- | src/plugins/coreplugin/editormanager/editorgroup.cpp | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/editormanager/openeditorsview.cpp | 4 | ||||
-rw-r--r-- | src/plugins/coreplugin/editormanager/openeditorswindow.cpp | 4 | ||||
-rw-r--r-- | src/plugins/coreplugin/editormanager/stackededitorgroup.cpp | 8 | ||||
-rw-r--r-- | src/plugins/coreplugin/fileiconprovider.cpp | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/generalsettings.ui | 4 | ||||
-rw-r--r-- | src/plugins/coreplugin/mainwindow.cpp | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/manhattanstyle.cpp | 12 | ||||
-rw-r--r-- | src/plugins/coreplugin/navigationwidget.cpp | 4 | ||||
-rw-r--r-- | src/plugins/coreplugin/outputpane.cpp | 12 | ||||
-rw-r--r-- | src/plugins/coreplugin/sidebar.cpp | 4 | ||||
-rw-r--r-- | src/plugins/coreplugin/versiondialog.cpp | 4 | ||||
-rw-r--r-- | src/plugins/coreplugin/welcomemode.cpp | 12 |
18 files changed, 65 insertions, 65 deletions
diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp index 51ad57bc27..468c76a0dc 100644 --- a/src/plugins/coreplugin/basefilewizard.cpp +++ b/src/plugins/coreplugin/basefilewizard.cpp @@ -503,7 +503,7 @@ QStringList BaseFileWizard::runWizard(const QString &path, QWidget *parent) QPixmap BaseFileWizard::watermark() { - return QPixmap(QLatin1String(":/qworkbench/images/qtwatermark.png")); + return QPixmap(QLatin1String(":/core/images/qtwatermark.png")); } void BaseFileWizard::setupWizard(QWizard *w) diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 00cd47c92b..c2a38452dc 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/qworkbench" > + <qresource prefix="/core" > <file>html/images/bg_site_header_dark_grey.png</file> <file>html/images/body_bg_circles_bottom_right.png</file> <file>html/images/body_bg_gradient.png</file> diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 301cfb6d39..dd8155db82 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -194,27 +194,27 @@ const char * const G_WINDOW_LIST = "QtCreator.Group.Window.List"; const char * const G_HELP_HELP = "QtCreator.Group.Help.Help"; const char * const G_HELP_ABOUT = "QtCreator.Group.Help.About"; -const char * const ICON_MINUS = ":/qworkbench/images/minus.png"; -const char * const ICON_PLUS = ":/qworkbench/images/plus.png"; -const char * const ICON_NEWFILE = ":/qworkbench/images/filenew.png"; -const char * const ICON_OPENFILE = ":/qworkbench/images/fileopen.png"; -const char * const ICON_SAVEFILE = ":/qworkbench/images/filesave.png"; -const char * const ICON_UNDO = ":/qworkbench/images/undo.png"; -const char * const ICON_REDO = ":/qworkbench/images/redo.png"; -const char * const ICON_COPY = ":/qworkbench/images/editcopy.png"; -const char * const ICON_PASTE = ":/qworkbench/images/editpaste.png"; -const char * const ICON_CUT = ":/qworkbench/images/editcut.png"; -const char * const ICON_NEXT = ":/qworkbench/images/next.png"; -const char * const ICON_PREV = ":/qworkbench/images/prev.png"; -const char * const ICON_DIR = ":/qworkbench/images/dir.png"; -const char * const ICON_CLEAN_PANE = ":/qworkbench/images/clean_pane_small.png"; -const char * const ICON_CLEAR = ":/qworkbench/images/clear.png"; -const char * const ICON_FIND = ":/qworkbench/images/find.png"; -const char * const ICON_FINDNEXT = ":/qworkbench/images/findnext.png"; -const char * const ICON_REPLACE = ":/qworkbench/images/replace.png"; -const char * const ICON_RESET = ":/qworkbench/images/reset.png"; -const char * const ICON_MAGNIFIER = ":/qworkbench/images/magnifier.png"; -const char * const ICON_TOGGLE_SIDEBAR = ":/qworkbench/images/sidebaricon.png"; +const char * const ICON_MINUS = ":/core/images/minus.png"; +const char * const ICON_PLUS = ":/core/images/plus.png"; +const char * const ICON_NEWFILE = ":/core/images/filenew.png"; +const char * const ICON_OPENFILE = ":/core/images/fileopen.png"; +const char * const ICON_SAVEFILE = ":/core/images/filesave.png"; +const char * const ICON_UNDO = ":/core/images/undo.png"; +const char * const ICON_REDO = ":/core/images/redo.png"; +const char * const ICON_COPY = ":/core/images/editcopy.png"; +const char * const ICON_PASTE = ":/core/images/editpaste.png"; +const char * const ICON_CUT = ":/core/images/editcut.png"; +const char * const ICON_NEXT = ":/core/images/next.png"; +const char * const ICON_PREV = ":/core/images/prev.png"; +const char * const ICON_DIR = ":/core/images/dir.png"; +const char * const ICON_CLEAN_PANE = ":/core/images/clean_pane_small.png"; +const char * const ICON_CLEAR = ":/core/images/clear.png"; +const char * const ICON_FIND = ":/core/images/find.png"; +const char * const ICON_FINDNEXT = ":/core/images/findnext.png"; +const char * const ICON_REPLACE = ":/core/images/replace.png"; +const char * const ICON_RESET = ":/core/images/reset.png"; +const char * const ICON_MAGNIFIER = ":/core/images/magnifier.png"; +const char * const ICON_TOGGLE_SIDEBAR = ":/core/images/sidebaricon.png"; // wizard kind const char * const WIZARD_TYPE_FILE = "QtCreator::WizardType::File"; diff --git a/src/plugins/coreplugin/coreplugin.h b/src/plugins/coreplugin/coreplugin.h index f14d3b1a74..a8341c97e9 100644 --- a/src/plugins/coreplugin/coreplugin.h +++ b/src/plugins/coreplugin/coreplugin.h @@ -31,8 +31,8 @@ ** ***************************************************************************/ -#ifndef QWORKBENCHPLUGIN_H -#define QWORKBENCHPLUGIN_H +#ifndef COREPLUGIN_H +#define COREPLUGIN_H #include <extensionsystem/iplugin.h> @@ -68,4 +68,4 @@ private: } // namespace Internal } // namespace Core -#endif // QWORKBENCHPLUGIN_H +#endif // COREPLUGIN_H diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.ui b/src/plugins/coreplugin/dialogs/shortcutsettings.ui index 4faaec4b32..f1cc3f795a 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.ui +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.ui @@ -131,7 +131,7 @@ </property> <property name="icon"> <iconset resource="../core.qrc"> - <normaloff>:/qworkbench/images/reset.png</normaloff>:/qworkbench/images/reset.png</iconset> + <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset> </property> </widget> </item> @@ -145,7 +145,7 @@ </property> <property name="icon"> <iconset resource="../core.qrc"> - <normaloff>:/qworkbench/images/clear.png</normaloff>:/qworkbench/images/clear.png</iconset> + <normaloff>:/core/images/clear.png</normaloff>:/core/images/clear.png</iconset> </property> </widget> </item> diff --git a/src/plugins/coreplugin/editormanager/editorgroup.cpp b/src/plugins/coreplugin/editormanager/editorgroup.cpp index 82c30db30f..91adef1780 100644 --- a/src/plugins/coreplugin/editormanager/editorgroup.cpp +++ b/src/plugins/coreplugin/editormanager/editorgroup.cpp @@ -118,7 +118,7 @@ QVariant EditorModel::data(const QModelIndex &index, int role) const : editor->displayName(); case Qt::DecorationRole: return editor->file()->isReadOnly() - ? QIcon(QLatin1String(":/qworkbench/images/locked.png")) + ? QIcon(QLatin1String(":/core/images/locked.png")) : QIcon(); case Qt::ToolTipRole: return editor->file()->fileName().isEmpty() diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp index a25e92ef0c..755826c94a 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp @@ -172,8 +172,8 @@ void OpenEditorsWidget::updateCurrentItem(QTreeWidgetItem *currentItem) //todo: this is almost duplicated in openeditorswindow void OpenEditorsWidget::updateItem(QTreeWidgetItem *item, IEditor *editor) { - static const QIcon lockedIcon(QLatin1String(":/qworkbench/images/locked.png")); - static const QIcon emptyIcon(QLatin1String(":/qworkbench/images/empty14.png")); + static const QIcon lockedIcon(QLatin1String(":/core/images/locked.png")); + static const QIcon emptyIcon(QLatin1String(":/core/images/empty14.png")); QString title = editor->displayName(); if (editor->file()->isModified()) title += tr("*"); diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp index b17b79c911..c7fe93b715 100644 --- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp @@ -300,8 +300,8 @@ void OpenEditorsWindow::centerOnItem(int selectedIndex) void OpenEditorsWindow::updateItem(QTreeWidgetItem *item, IEditor *editor) { - static const QIcon lockedIcon(QLatin1String(":/qworkbench/images/locked.png")); - static const QIcon emptyIcon(QLatin1String(":/qworkbench/images/empty14.png")); + static const QIcon lockedIcon(QLatin1String(":/core/images/locked.png")); + static const QIcon emptyIcon(QLatin1String(":/core/images/empty14.png")); QString title = editor->displayName(); if (editor->file()->isModified()) diff --git a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp index 6b46fa3b16..0111be02b7 100644 --- a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp +++ b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp @@ -103,7 +103,7 @@ StackedEditorGroup::StackedEditorGroup(QWidget *parent) : m_lockButton->setProperty("type", QLatin1String("dockbutton")); m_closeButton->setAutoRaise(true); - m_closeButton->setIcon(QIcon(":/qworkbench/images/closebutton.png")); + m_closeButton->setIcon(QIcon(":/core/images/closebutton.png")); m_closeButton->setProperty("type", QLatin1String("dockbutton")); QToolBar *rightToolBar = new QToolBar; @@ -150,7 +150,7 @@ StackedEditorGroup::StackedEditorGroup(QWidget *parent) : QToolButton *closeButton = new QToolButton; closeButton->setAutoRaise(true); - closeButton->setIcon(QIcon(":/qworkbench/images/clear.png")); + closeButton->setIcon(QIcon(":/core/images/clear.png")); closeButton->setToolTip(tr("Close")); connect(closeButton, SIGNAL(clicked()), m_infoWidget, SLOT(hide())); @@ -303,8 +303,8 @@ void StackedEditorGroup::checkEditorStatus() void StackedEditorGroup::updateEditorStatus(IEditor *editor) { - static const QIcon lockedIcon(QLatin1String(":/qworkbench/images/locked.png")); - static const QIcon unlockedIcon(QLatin1String(":/qworkbench/images/unlocked.png")); + static const QIcon lockedIcon(QLatin1String(":/core/images/locked.png")); + static const QIcon unlockedIcon(QLatin1String(":/core/images/unlocked.png")); if (editor->file()->isReadOnly()) { m_lockButton->setIcon(lockedIcon); diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp index 772c826d3f..0c4b4a39de 100644 --- a/src/plugins/coreplugin/fileiconprovider.cpp +++ b/src/plugins/coreplugin/fileiconprovider.cpp @@ -48,7 +48,7 @@ using namespace Core; FileIconProvider *FileIconProvider::m_instance = 0; FileIconProvider::FileIconProvider() - : m_unknownFileIcon(QLatin1String(":/qworkbench/images/unknownfile.png")) + : m_unknownFileIcon(QLatin1String(":/core/images/unknownfile.png")) { } diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui index f3b50c5e4b..c014fae607 100644 --- a/src/plugins/coreplugin/generalsettings.ui +++ b/src/plugins/coreplugin/generalsettings.ui @@ -77,7 +77,7 @@ </property> <property name="icon"> <iconset resource="core.qrc"> - <normaloff>:/qworkbench/images/reset.png</normaloff>:/qworkbench/images/reset.png</iconset> + <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset> </property> </widget> </item> @@ -118,7 +118,7 @@ </property> <property name="icon"> <iconset resource="core.qrc"> - <normaloff>:/qworkbench/images/reset.png</normaloff>:/qworkbench/images/reset.png</iconset> + <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset> </property> </widget> </item> diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index f68c5da7d0..9a70673e08 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -149,7 +149,7 @@ MainWindow::MainWindow() : m_toggleSideBarButton(new QToolButton) { setWindowTitle(tr("Qt Creator")); - qApp->setWindowIcon(QIcon(":/qworkbench/images/qtcreator_logo_128.png")); + qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png")); setDockNestingEnabled(true); setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index 5b72c891cd..9237883221 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -102,11 +102,11 @@ public: { style = QStyleFactory::create(baseStyleName); QTC_ASSERT(style, /**/); - buttonImage_pressed = QImage(":/qworkbench/images/pushbutton_pressed.png"); - buttonImage = QImage(":/qworkbench/images/pushbutton.png"); + buttonImage_pressed = QImage(":/core/images/pushbutton_pressed.png"); + buttonImage = QImage(":/core/images/pushbutton.png"); - lineeditImage = QImage(":/qworkbench/images/inputfield.png"); - lineeditImage_disabled = QImage(":/qworkbench/images/inputfield_disabled.png"); + lineeditImage = QImage(":/core/images/inputfield.png"); + lineeditImage_disabled = QImage(":/core/images/inputfield_disabled.png"); } ~ManhattanStylePrivate() @@ -345,7 +345,7 @@ void ManhattanStyle::polish(QPalette &pal) QIcon ManhattanStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const { - static const QIcon closeButton(":/qworkbench/images/closebutton.png"); + static const QIcon closeButton(":/core/images/closebutton.png"); QIcon icon; switch (standardIcon) { case QStyle::SP_TitleBarCloseButton: @@ -360,7 +360,7 @@ QIcon ManhattanStyle::standardIconImplementation(StandardPixmap standardIcon, co QPixmap ManhattanStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget) const { - static const QPixmap closeButton(":/qworkbench/images/closebutton.png"); + static const QPixmap closeButton(":/core/images/closebutton.png"); QPixmap pixmap; switch (standardPixmap) { case QStyle::SP_TitleBarCloseButton: diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index 412559a9b0..491c394343 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -358,13 +358,13 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget) QToolButton *split = new QToolButton; split->setProperty("type", QLatin1String("dockbutton")); - split->setIcon(QIcon(":/qworkbench/images/splitbutton_horizontal.png")); + split->setIcon(QIcon(":/core/images/splitbutton_horizontal.png")); split->setToolTip(tr("Split")); connect(split, SIGNAL(clicked(bool)), this, SIGNAL(split())); QToolButton *close = new QToolButton; close->setProperty("type", QLatin1String("dockbutton")); - close->setIcon(QIcon(":/qworkbench/images/closebutton.png")); + close->setIcon(QIcon(":/core/images/closebutton.png")); close->setToolTip(tr("Close")); connect(close, SIGNAL(clicked(bool)), this, SIGNAL(close())); diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp index 6d97c5d361..6b5c3b146d 100644 --- a/src/plugins/coreplugin/outputpane.cpp +++ b/src/plugins/coreplugin/outputpane.cpp @@ -167,7 +167,7 @@ OutputPane::OutputPane(const QList<int> &context, QWidget *parent) : m_clearButton->setToolTip(tr("Clear")); connect(m_clearButton, SIGNAL(clicked()), this, SLOT(clearPage())); - m_closeButton->setIcon(QIcon(":/qworkbench/images/closebutton.png")); + m_closeButton->setIcon(QIcon(":/core/images/closebutton.png")); m_closeButton->setProperty("type", QLatin1String("dockbutton")); connect(m_closeButton, SIGNAL(clicked()), this, SLOT(slotHide())); @@ -488,13 +488,13 @@ OutputPaneToggleButton::OutputPaneToggleButton(int number, const QString &text, setFocusPolicy(Qt::NoFocus); setCheckable(true); setStyleSheet( - "QPushButton { border-image: url(:/qworkbench/images/panel_button.png) 2 2 2 19;" + "QPushButton { border-image: url(:/core/images/panel_button.png) 2 2 2 19;" " border-width: 2px 2px 2px 19px; padding-left: -17; padding-right: 4 } " - "QPushButton:checked { border-image: url(:/qworkbench/images/panel_button_checked.png) 2 2 2 19 } " + "QPushButton:checked { border-image: url(:/core/images/panel_button_checked.png) 2 2 2 19 } " #ifndef Q_WS_MAC // Mac UI's dont usually do hover - "QPushButton:checked:hover { border-image: url(:/qworkbench/images/panel_button_checked_hover.png) 2 2 2 19 } " - "QPushButton:pressed:hover { border-image: url(:/qworkbench/images/panel_button_pressed.png) 2 2 2 19 } " - "QPushButton:hover { border-image: url(:/qworkbench/images/panel_button_hover.png) 2 2 2 19 } " + "QPushButton:checked:hover { border-image: url(:/core/images/panel_button_checked_hover.png) 2 2 2 19 } " + "QPushButton:pressed:hover { border-image: url(:/core/images/panel_button_pressed.png) 2 2 2 19 } " + "QPushButton:hover { border-image: url(:/core/images/panel_button_hover.png) 2 2 2 19 } " #endif ); } diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp index 36f744769f..17887450d9 100644 --- a/src/plugins/coreplugin/sidebar.cpp +++ b/src/plugins/coreplugin/sidebar.cpp @@ -231,13 +231,13 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &title) m_splitButton = new QToolButton; m_splitButton->setProperty("type", QLatin1String("dockbutton")); - m_splitButton->setIcon(QIcon(":/qworkbench/images/splitbutton_horizontal.png")); + m_splitButton->setIcon(QIcon(":/core/images/splitbutton_horizontal.png")); m_splitButton->setToolTip(tr("Split")); connect(m_splitButton, SIGNAL(clicked(bool)), this, SIGNAL(split())); m_closeButton = new QToolButton; m_closeButton->setProperty("type", QLatin1String("dockbutton")); - m_closeButton->setIcon(QIcon(":/qworkbench/images/closebutton.png")); + m_closeButton->setIcon(QIcon(":/core/images/closebutton.png")); m_closeButton->setToolTip(tr("Close")); connect(m_closeButton, SIGNAL(clicked(bool)), this, SIGNAL(close())); diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index 4fdb3166cf..52810c00ef 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -56,7 +56,7 @@ VersionDialog::VersionDialog(QWidget *parent) { // We need to set the window icon explicitly here since for some reason the // application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME) - setWindowIcon(QIcon(":/qworkbench/images/qtcreator_logo_128.png")); + setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png")); setWindowTitle(tr("About Qt Creator")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); @@ -102,7 +102,7 @@ VersionDialog::VersionDialog(QWidget *parent) connect(buttonBox , SIGNAL(helpRequested()), this, SLOT(popupLicense())); QLabel *logoLabel = new QLabel; - logoLabel->setPixmap(QPixmap(QLatin1String(":/qworkbench/images/qtcreator_logo_128.png"))); + logoLabel->setPixmap(QPixmap(QLatin1String(":/core/images/qtcreator_logo_128.png"))); layout->addWidget(logoLabel , 0, 0, 1, 1); layout->addWidget(copyRightLabel, 0, 1, 4, 4); layout->addWidget(buttonBox, 4, 0, 1, 5); diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp index be5dd62429..a0f5f98b99 100644 --- a/src/plugins/coreplugin/welcomemode.cpp +++ b/src/plugins/coreplugin/welcomemode.cpp @@ -92,16 +92,16 @@ WelcomeModePrivate::WelcomeModePrivate() : #else m_label(new QLabel), #endif - m_htmlTemplate(readFile(QLatin1String(":/qworkbench/html/welcome.html"))), - m_sessionHtmlTemplate(readFile(QLatin1String(":/qworkbench/html/recent_sessions.html"))), - m_projectHtmlTemplate(readFile(QLatin1String(":/qworkbench/html/recent_projects.html"))), - m_baseUrl(QUrl(QLatin1String("qrc:/qworkbench/html/welcome.html"))) + m_htmlTemplate(readFile(QLatin1String(":/core/html/welcome.html"))), + m_sessionHtmlTemplate(readFile(QLatin1String(":/core/html/recent_sessions.html"))), + m_projectHtmlTemplate(readFile(QLatin1String(":/core/html/recent_projects.html"))), + m_baseUrl(QUrl(QLatin1String("qrc:/core/html/welcome.html"))) { } #if defined(QT_NO_WEBKIT) -const char *LABEL = "<center><table><tr><td><img src=\":/qworkbench/html/images/product_logo.png\"/></td><td width=300>" +const char *LABEL = "<center><table><tr><td><img src=\":/core/html/images/product_logo.png\"/></td><td width=300>" "<h2><br/><br/>Welcome</h2><p> Qt Creator is an intuitive, modern cross platform IDE that enables " "developers to create graphically appealing applications for desktop, " "embedded, and mobile devices. " @@ -172,7 +172,7 @@ QString WelcomeMode::name() const QIcon WelcomeMode::icon() const { - return QIcon(QLatin1String(":/qworkbench/images/qtcreator_logo_32.png")); + return QIcon(QLatin1String(":/core/images/qtcreator_logo_32.png")); } int WelcomeMode::priority() const |