1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Task-number: QTBUG-23272

Change-Id: Idcdb9620910577b3c0fc9a792a0446665bd2eab6
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
hjk 2012-03-26 09:16:03 +02:00 committed by Qt by Nokia
parent 3198247ccf
commit 6d13e9f295
17 changed files with 201 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/text/qtextimagehandler.cpp
View File

@ -79,7 +79,7 @@ static QPixmap getPixmap(QTextDocument *doc, const QTextImageFormat &format)
if (img.isNull()) { // try direct loading if (img.isNull()) { // try direct loading
name = format.name(); // remove qrc:/ prefix again name = format.name(); // remove qrc:/ prefix again
if (name.isEmpty() || !img.load(name)) if (name.isEmpty() || !img.load(name))
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/file-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/file-16.png"));
} }
pm = QPixmap::fromImage(img); pm = QPixmap::fromImage(img);
doc->addResource(QTextDocument::ImageResource, url, pm); doc->addResource(QTextDocument::ImageResource, url, pm);
@ -154,7 +154,7 @@ static QImage getImage(QTextDocument *doc, const QTextImageFormat &format)
if (image.isNull()) { // try direct loading if (image.isNull()) { // try direct loading
name = format.name(); // remove qrc:/ prefix again name = format.name(); // remove qrc:/ prefix again
if (name.isEmpty() || !image.load(name)) if (name.isEmpty() || !image.load(name))
return QImage(QLatin1String(":/trolltech/styles/commonstyle/images/file-16.png")); return QImage(QLatin1String(":/qt-project.org/styles/commonstyle/images/file-16.png"));
} }
doc->addResource(QTextDocument::ImageResource, url, image); doc->addResource(QTextDocument::ImageResource, url, image);
} }

8
src/plugins/platforms/cocoa/qcocoacursor.mm
View File

@ -204,19 +204,19 @@ NSCursor *QCocoaCursor::createCursorData(QCursor *cursor)
return createCursorFromPixmap(pixmap); return createCursorFromPixmap(pixmap);
break; } break; }
case Qt::WaitCursor: { case Qt::WaitCursor: {
QPixmap pixmap = QPixmap(QLatin1String(":/trolltech/mac/cursors/images/spincursor.png")); QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/spincursor.png"));
return createCursorFromPixmap(pixmap); return createCursorFromPixmap(pixmap);
break; } break; }
case Qt::SizeAllCursor: { case Qt::SizeAllCursor: {
QPixmap pixmap = QPixmap(QLatin1String(":/trolltech/mac/cursors/images/pluscursor.png")); QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/pluscursor.png"));
return createCursorFromPixmap(pixmap); return createCursorFromPixmap(pixmap);
break; } break; }
case Qt::BusyCursor: { case Qt::BusyCursor: {
QPixmap pixmap = QPixmap(QLatin1String(":/trolltech/mac/cursors/images/waitcursor.png")); QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/waitcursor.png"));
return createCursorFromPixmap(pixmap); return createCursorFromPixmap(pixmap);
break; } break; }
case Qt::ForbiddenCursor: { case Qt::ForbiddenCursor: {
QPixmap pixmap = QPixmap(QLatin1String(":/trolltech/mac/cursors/images/forbiddencursor.png")); QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/forbiddencursor.png"));
return createCursorFromPixmap(pixmap); return createCursorFromPixmap(pixmap);
break; } break; }
#define QT_USE_APPROXIMATE_CURSORS #define QT_USE_APPROXIMATE_CURSORS

2
src/plugins/platforms/cocoa/qcocoamenuloader.mm
View File

@ -82,7 +82,7 @@ void qt_mac_loadMenuNib(QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader)
} }
// Copy nib files from resources to temp. // Copy nib files from resources to temp.
QDir nibResource(":/trolltech/mac/qt_menu.nib/"); QDir nibResource(":/qt-project.org/mac/qt_menu.nib/");
if (!nibResource.exists()) { if (!nibResource.exists()) {
qWarning("qt_mac_loadMenuNib: could not load nib from resources"); qWarning("qt_mac_loadMenuNib: could not load nib from resources");
return; return;

6
src/plugins/platforms/cocoa/qcocoaresources.qrc
View File

@ -1,15 +1,15 @@
<!DOCTYPE RCC><RCC version="1.0"> <!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/trolltech/mac/cursors"> <qresource prefix="/qt-project.org/mac/cursors">
<file>images/copyarrowcursor.png</file> <file>images/copyarrowcursor.png</file>
<file>images/forbiddencursor.png</file> <file>images/forbiddencursor.png</file>
<file>images/spincursor.png</file> <file>images/spincursor.png</file>
<file>images/waitcursor.png</file> <file>images/waitcursor.png</file>
<file>images/pluscursor.png</file> <file>images/pluscursor.png</file>
</qresource> </qresource>
<qresource prefix="/trolltech/mac/style"> <qresource prefix="/qt-project.org/mac/style">
<file>images/leopard-unified-toolbar-on.png</file> <file>images/leopard-unified-toolbar-on.png</file>
</qresource> </qresource>
<qresource prefix="/trolltech/mac/"> <qresource prefix="/qt-project.org/mac/">
<file>qt_menu.nib/classes.nib</file> <file>qt_menu.nib/classes.nib</file>
<file>qt_menu.nib/info.nib</file> <file>qt_menu.nib/info.nib</file>
<file>qt_menu.nib/keyedobjects.nib</file> <file>qt_menu.nib/keyedobjects.nib</file>

4
src/printsupport/dialogs/qprintdialog.qrc
View File

@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0"> <!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/trolltech/dialogs/qprintpreviewdialog"> <qresource prefix="/qt-project.org/dialogs/qprintpreviewdialog">
<file>images/fit-page-24.png</file> <file>images/fit-page-24.png</file>
<file>images/fit-page-32.png</file> <file>images/fit-page-32.png</file>
<file>images/fit-width-24.png</file> <file>images/fit-width-24.png</file>
@ -31,7 +31,7 @@
<file>images/zoom-out-24.png</file> <file>images/zoom-out-24.png</file>
<file>images/zoom-out-32.png</file> <file>images/zoom-out-32.png</file>
</qresource> </qresource>
<qresource prefix="/trolltech/dialogs/qprintdialog"> <qresource prefix="/qt-project.org/dialogs/qprintdialog">
<file>images/status-color.png</file> <file>images/status-color.png</file>
<file>images/status-gray-scale.png</file> <file>images/status-gray-scale.png</file>
</qresource> </qresource>

4
src/printsupport/dialogs/qprintdialog_unix.cpp
View File

@ -385,9 +385,9 @@ void QPrintDialogPrivate::init()
bottom = new QWidget(q); bottom = new QWidget(q);
options.setupUi(bottom); options.setupUi(bottom);
options.color->setIconSize(QSize(32, 32)); options.color->setIconSize(QSize(32, 32));
options.color->setIcon(QIcon(QLatin1String(":/trolltech/dialogs/qprintdialog/images/status-color.png"))); options.color->setIcon(QIcon(QLatin1String(":/qt-project.org/dialogs/qprintdialog/images/status-color.png")));
options.grayscale->setIconSize(QSize(32, 32)); options.grayscale->setIconSize(QSize(32, 32));
options.grayscale->setIcon(QIcon(QLatin1String(":/trolltech/dialogs/qprintdialog/images/status-gray-scale.png"))); options.grayscale->setIcon(QIcon(QLatin1String(":/qt-project.org/dialogs/qprintdialog/images/status-gray-scale.png")));
top->d->setOptionsPane(this); top->d->setOptionsPane(this);
buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, q); buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, q);

2
src/printsupport/dialogs/qprintpreviewdialog.cpp
View File

@ -341,7 +341,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer)
static inline void qt_setupActionIcon(QAction *action, const QLatin1String &name) static inline void qt_setupActionIcon(QAction *action, const QLatin1String &name)
{ {
QLatin1String imagePrefix(":/trolltech/dialogs/qprintpreviewdialog/images/"); QLatin1String imagePrefix(":/qt-project.org/dialogs/qprintpreviewdialog/images/");
QIcon icon; QIcon icon;
icon.addFile(imagePrefix + name + QLatin1String("-24.png"), QSize(24, 24)); icon.addFile(imagePrefix + name + QLatin1String("-24.png"), QSize(24, 24));
icon.addFile(imagePrefix + name + QLatin1String("-32.png"), QSize(32, 32)); icon.addFile(imagePrefix + name + QLatin1String("-32.png"), QSize(32, 32));

2
src/widgets/dialogs/qmessagebox.cpp
View File

@ -1771,7 +1771,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title)
msgBox->setText(translatedTextAboutQtCaption); msgBox->setText(translatedTextAboutQtCaption);
msgBox->setInformativeText(translatedTextAboutQtText); msgBox->setInformativeText(translatedTextAboutQtText);
QPixmap pm(QLatin1String(":/trolltech/qmessagebox/images/qtlogo-64.png")); QPixmap pm(QLatin1String(":/qt-project.org/qmessagebox/images/qtlogo-64.png"));
if (!pm.isNull()) if (!pm.isNull())
msgBox->setIconPixmap(pm); msgBox->setIconPixmap(pm);
#if defined(Q_OS_WINCE) #if defined(Q_OS_WINCE)

2
src/widgets/dialogs/qmessagebox.qrc
View File

@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0"> <!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/trolltech/qmessagebox"> <qresource prefix="/qt-project.org/qmessagebox">
<file>images/qtlogo-64.png</file> <file>images/qtlogo-64.png</file>
</qresource> </qresource>
</RCC> </RCC>

304
src/widgets/styles/qcommonstyle.cpp
View File

@ -374,13 +374,13 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
case PE_IndicatorTabClose: { case PE_IndicatorTabClose: {
if (d->tabBarcloseButtonIcon.isNull()) { if (d->tabBarcloseButtonIcon.isNull()) {
d->tabBarcloseButtonIcon.addPixmap(QPixmap( d->tabBarcloseButtonIcon.addPixmap(QPixmap(
QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-closetab-16.png")), QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-closetab-16.png")),
QIcon::Normal, QIcon::Off); QIcon::Normal, QIcon::Off);
d->tabBarcloseButtonIcon.addPixmap(QPixmap( d->tabBarcloseButtonIcon.addPixmap(QPixmap(
QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-closetab-down-16.png")), QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-closetab-down-16.png")),
QIcon::Normal, QIcon::On); QIcon::Normal, QIcon::On);
d->tabBarcloseButtonIcon.addPixmap(QPixmap( d->tabBarcloseButtonIcon.addPixmap(QPixmap(
QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-closetab-hover-16.png")), QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-closetab-hover-16.png")),
QIcon::Active, QIcon::Off); QIcon::Active, QIcon::Off);
} }
@ -5211,99 +5211,99 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti
return proxy()->standardPixmap(SP_ArrowRight, option, widget); return proxy()->standardPixmap(SP_ArrowRight, option, widget);
return proxy()->standardPixmap(SP_ArrowLeft, option, widget); return proxy()->standardPixmap(SP_ArrowLeft, option, widget);
case SP_ArrowLeft: case SP_ArrowLeft:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/left-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/left-16.png"));
case SP_ArrowRight: case SP_ArrowRight:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/right-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/right-16.png"));
case SP_ArrowUp: case SP_ArrowUp:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/up-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/up-16.png"));
case SP_ArrowDown: case SP_ArrowDown:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/down-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/down-16.png"));
case SP_FileDialogToParent: case SP_FileDialogToParent:
return proxy()->standardPixmap(SP_ArrowUp, option, widget); return proxy()->standardPixmap(SP_ArrowUp, option, widget);
case SP_FileDialogNewFolder: case SP_FileDialogNewFolder:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/newdirectory-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-16.png"));
case SP_FileDialogDetailedView: case SP_FileDialogDetailedView:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/viewdetailed-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewdetailed-16.png"));
case SP_FileDialogInfoView: case SP_FileDialogInfoView:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/fileinfo-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/fileinfo-16.png"));
case SP_FileDialogContentsView: case SP_FileDialogContentsView:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/filecontents-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/filecontents-16.png"));
case SP_FileDialogListView: case SP_FileDialogListView:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/viewlist-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewlist-16.png"));
case SP_FileDialogBack: case SP_FileDialogBack:
return proxy()->standardPixmap(SP_ArrowBack, option, widget); return proxy()->standardPixmap(SP_ArrowBack, option, widget);
case SP_DriveHDIcon: case SP_DriveHDIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/harddrive-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/harddrive-16.png"));
case SP_TrashIcon: case SP_TrashIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/trash-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/trash-16.png"));
case SP_DriveFDIcon: case SP_DriveFDIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/floppy-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/floppy-16.png"));
case SP_DriveNetIcon: case SP_DriveNetIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/networkdrive-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/networkdrive-16.png"));
case SP_DesktopIcon: case SP_DesktopIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/desktop-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/desktop-16.png"));
case SP_ComputerIcon: case SP_ComputerIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/computer-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/computer-16.png"));
case SP_DriveCDIcon: case SP_DriveCDIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/cdr-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/cdr-16.png"));
case SP_DriveDVDIcon: case SP_DriveDVDIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/dvd-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/dvd-16.png"));
case SP_DirHomeIcon: case SP_DirHomeIcon:
case SP_DirOpenIcon: case SP_DirOpenIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/diropen-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/diropen-16.png"));
case SP_DirIcon: case SP_DirIcon:
case SP_DirClosedIcon: case SP_DirClosedIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/dirclosed-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/dirclosed-16.png"));
case SP_DirLinkIcon: case SP_DirLinkIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/dirlink-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/dirlink-16.png"));
case SP_FileIcon: case SP_FileIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/file-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/file-16.png"));
case SP_FileLinkIcon: case SP_FileLinkIcon:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/filelink-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/filelink-16.png"));
case SP_DialogOkButton: case SP_DialogOkButton:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-ok-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-ok-16.png"));
case SP_DialogCancelButton: case SP_DialogCancelButton:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-cancel-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-cancel-16.png"));
case SP_DialogHelpButton: case SP_DialogHelpButton:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-help-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-help-16.png"));
case SP_DialogOpenButton: case SP_DialogOpenButton:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
case SP_DialogSaveButton: case SP_DialogSaveButton:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png"));
case SP_DialogCloseButton: case SP_DialogCloseButton:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-close-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-close-16.png"));
case SP_DialogApplyButton: case SP_DialogApplyButton:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-apply-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-apply-16.png"));
case SP_DialogResetButton: case SP_DialogResetButton:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-clear-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-clear-16.png"));
case SP_DialogDiscardButton: case SP_DialogDiscardButton:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-delete-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-delete-16.png"));
case SP_DialogYesButton: case SP_DialogYesButton:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-yes-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-yes-16.png"));
case SP_DialogNoButton: case SP_DialogNoButton:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-no-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-no-16.png"));
case SP_BrowserReload: case SP_BrowserReload:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/refresh-24.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/refresh-24.png"));
case SP_BrowserStop: case SP_BrowserStop:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/stop-24.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/stop-24.png"));
case SP_MediaPlay: case SP_MediaPlay:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/media-play-32.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-play-32.png"));
case SP_MediaPause: case SP_MediaPause:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/media-pause-32.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-pause-32.png"));
case SP_MediaStop: case SP_MediaStop:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/media-stop-32.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-stop-32.png"));
case SP_MediaSeekForward: case SP_MediaSeekForward:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/media-seek-forward-32.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-seek-forward-32.png"));
case SP_MediaSeekBackward: case SP_MediaSeekBackward:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/media-seek-backward-32.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-seek-backward-32.png"));
case SP_MediaSkipForward: case SP_MediaSkipForward:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/media-skip-forward-32.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-skip-forward-32.png"));
case SP_MediaSkipBackward: case SP_MediaSkipBackward:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/media-skip-backward-32.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-skip-backward-32.png"));
case SP_MediaVolume: case SP_MediaVolume:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/media-volume-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-volume-16.png"));
case SP_MediaVolumeMuted: case SP_MediaVolumeMuted:
return QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/media-volume-muted-16.png")); return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-volume-muted-16.png"));
#endif // QT_NO_IMAGEFORMAT_PNG #endif // QT_NO_IMAGEFORMAT_PNG
default: default:
break; break;
@ -5561,11 +5561,11 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons
case SP_TitleBarCloseButton: { case SP_TitleBarCloseButton: {
QIcon titleBarIcon; QIcon titleBarIcon;
if (standardIcon == SP_TitleBarCloseButton) { if (standardIcon == SP_TitleBarCloseButton) {
titleBarIcon.addFile(QLatin1String(":/trolltech/styles/macstyle/images/closedock-16.png")); titleBarIcon.addFile(QLatin1String(":/qt-project.org/styles/macstyle/images/closedock-16.png"));
titleBarIcon.addFile(QLatin1String(":/trolltech/styles/macstyle/images/closedock-down-16.png"), QSize(16, 16), QIcon::Normal, QIcon::On); titleBarIcon.addFile(QLatin1String(":/qt-project.org/styles/macstyle/images/closedock-down-16.png"), QSize(16, 16), QIcon::Normal, QIcon::On);
} else { } else {
titleBarIcon.addFile(QLatin1String(":/trolltech/styles/macstyle/images/dockdock-16.png")); titleBarIcon.addFile(QLatin1String(":/qt-project.org/styles/macstyle/images/dockdock-16.png"));
titleBarIcon.addFile(QLatin1String(":/trolltech/styles/macstyle/images/dockdock-down-16.png"), QSize(16, 16), QIcon::Normal, QIcon::On); titleBarIcon.addFile(QLatin1String(":/qt-project.org/styles/macstyle/images/dockdock-down-16.png"), QSize(16, 16), QIcon::Normal, QIcon::On);
} }
return titleBarIcon; return titleBarIcon;
} }
@ -5602,88 +5602,88 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons
switch (standardIcon) { switch (standardIcon) {
#ifndef QT_NO_IMAGEFORMAT_PNG #ifndef QT_NO_IMAGEFORMAT_PNG
case SP_FileDialogNewFolder: case SP_FileDialogNewFolder:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/newdirectory-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/newdirectory-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/newdirectory-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-128.png"), QSize(128, 128));
break; break;
case SP_FileDialogBack: case SP_FileDialogBack:
return standardIconImplementation(SP_ArrowBack, option, widget); return standardIconImplementation(SP_ArrowBack, option, widget);
case SP_FileDialogToParent: case SP_FileDialogToParent:
return standardIconImplementation(SP_ArrowUp, option, widget); return standardIconImplementation(SP_ArrowUp, option, widget);
case SP_FileDialogDetailedView: case SP_FileDialogDetailedView:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/viewdetailed-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewdetailed-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/viewdetailed-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewdetailed-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/viewdetailed-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewdetailed-128.png"), QSize(128, 128));
break; break;
case SP_FileDialogInfoView: case SP_FileDialogInfoView:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/fileinfo-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/fileinfo-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/fileinfo-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/fileinfo-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/fileinfo-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/fileinfo-128.png"), QSize(128, 128));
break; break;
case SP_FileDialogContentsView: case SP_FileDialogContentsView:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/filecontents-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/filecontents-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/filecontents-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/filecontents-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/filecontents-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/filecontents-128.png"), QSize(128, 128));
break; break;
case SP_FileDialogListView: case SP_FileDialogListView:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/viewlist-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewlist-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/viewlist-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewlist-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/viewlist-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewlist-128.png"), QSize(128, 128));
break; break;
case SP_DialogOkButton: case SP_DialogOkButton:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-ok-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-ok-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-ok-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-ok-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-ok-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-ok-128.png"), QSize(128, 128));
break; break;
case SP_DialogCancelButton: case SP_DialogCancelButton:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-cancel-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-cancel-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-cancel-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-cancel-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-cancel-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-cancel-128.png"), QSize(128, 128));
break; break;
case SP_DialogHelpButton: case SP_DialogHelpButton:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-help-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-help-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-help-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-help-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-help-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-help-128.png"), QSize(128, 128));
break; break;
case SP_DialogOpenButton: case SP_DialogOpenButton:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-128.png"), QSize(128, 128));
break; break;
case SP_DialogSaveButton: case SP_DialogSaveButton:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-128.png"), QSize(128, 128));
break; break;
case SP_DialogCloseButton: case SP_DialogCloseButton:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-close-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-close-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-close-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-close-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-close-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-close-128.png"), QSize(128, 128));
break; break;
case SP_DialogApplyButton: case SP_DialogApplyButton:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-apply-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-apply-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-apply-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-apply-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-apply-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-apply-128.png"), QSize(128, 128));
break; break;
case SP_DialogResetButton: case SP_DialogResetButton:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-clear-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-clear-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-clear-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-clear-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-clear-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-clear-128.png"), QSize(128, 128));
break; break;
case SP_DialogDiscardButton: case SP_DialogDiscardButton:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-delete-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-delete-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-delete-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-delete-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-delete-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-delete-128.png"), QSize(128, 128));
break; break;
case SP_DialogYesButton: case SP_DialogYesButton:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-yes-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-yes-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-yes-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-yes-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-yes-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-yes-128.png"), QSize(128, 128));
break; break;
case SP_DialogNoButton: case SP_DialogNoButton:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-no-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-no-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-no-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-no-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-no-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-no-128.png"), QSize(128, 128));
break; break;
case SP_ArrowForward: case SP_ArrowForward:
if (rtl) if (rtl)
@ -5694,106 +5694,106 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons
return standardIconImplementation(SP_ArrowRight, option, widget); return standardIconImplementation(SP_ArrowRight, option, widget);
return standardIconImplementation(SP_ArrowLeft, option, widget); return standardIconImplementation(SP_ArrowLeft, option, widget);
case SP_ArrowLeft: case SP_ArrowLeft:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/left-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/left-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/left-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/left-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/left-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/left-128.png"), QSize(128, 128));
break; break;
case SP_ArrowRight: case SP_ArrowRight:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/right-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/right-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/right-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/right-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/right-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/right-128.png"), QSize(128, 128));
break; break;
case SP_ArrowUp: case SP_ArrowUp:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/up-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/up-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/up-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/up-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/up-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/up-128.png"), QSize(128, 128));
break; break;
case SP_ArrowDown: case SP_ArrowDown:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/down-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/down-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/down-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/down-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/down-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/down-128.png"), QSize(128, 128));
break; break;
case SP_DirHomeIcon: case SP_DirHomeIcon:
case SP_DirIcon: case SP_DirIcon:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/dirclosed-16.png"), icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/dirclosed-16.png"),
QSize(), QIcon::Normal, QIcon::Off); QSize(), QIcon::Normal, QIcon::Off);
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/diropen-16.png"), icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/diropen-16.png"),
QSize(), QIcon::Normal, QIcon::On); QSize(), QIcon::Normal, QIcon::On);
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/dirclosed-32.png"), icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/dirclosed-32.png"),
QSize(32, 32), QIcon::Normal, QIcon::Off); QSize(32, 32), QIcon::Normal, QIcon::Off);
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/diropen-32.png"), icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/diropen-32.png"),
QSize(32, 32), QIcon::Normal, QIcon::On); QSize(32, 32), QIcon::Normal, QIcon::On);
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/dirclosed-128.png"), icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/dirclosed-128.png"),
QSize(128, 128), QIcon::Normal, QIcon::Off); QSize(128, 128), QIcon::Normal, QIcon::Off);
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/diropen-128.png"), icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/diropen-128.png"),
QSize(128, 128), QIcon::Normal, QIcon::On); QSize(128, 128), QIcon::Normal, QIcon::On);
break; break;
case SP_DriveCDIcon: case SP_DriveCDIcon:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/cdr-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/cdr-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/cdr-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/cdr-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/cdr-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/cdr-128.png"), QSize(128, 128));
break; break;
case SP_DriveDVDIcon: case SP_DriveDVDIcon:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/dvd-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/dvd-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/dvd-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/dvd-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/dvd-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/dvd-128.png"), QSize(128, 128));
break; break;
case SP_FileIcon: case SP_FileIcon:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/file-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/file-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/file-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/file-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/file-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/file-128.png"), QSize(128, 128));
break; break;
case SP_FileLinkIcon: case SP_FileLinkIcon:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/filelink-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/filelink-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/filelink-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/filelink-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/filelink-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/filelink-128.png"), QSize(128, 128));
break; break;
case SP_TrashIcon: case SP_TrashIcon:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/trash-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/trash-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/trash-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/trash-32.png"), QSize(32, 32));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/trash-128.png"), QSize(128, 128)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/trash-128.png"), QSize(128, 128));
break; break;
case SP_BrowserReload: case SP_BrowserReload:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/refresh-24.png"), QSize(24, 24)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/refresh-24.png"), QSize(24, 24));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/refresh-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/refresh-32.png"), QSize(32, 32));
break; break;
case SP_BrowserStop: case SP_BrowserStop:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/stop-24.png"), QSize(24, 24)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/stop-24.png"), QSize(24, 24));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/stop-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/stop-32.png"), QSize(32, 32));
break; break;
case SP_MediaPlay: case SP_MediaPlay:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-play-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-play-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-play-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-play-32.png"), QSize(32, 32));
break; break;
case SP_MediaPause: case SP_MediaPause:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-pause-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-pause-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-pause-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-pause-32.png"), QSize(32, 32));
break; break;
case SP_MediaStop: case SP_MediaStop:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-stop-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-stop-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-stop-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-stop-32.png"), QSize(32, 32));
break; break;
case SP_MediaSeekForward: case SP_MediaSeekForward:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-seek-forward-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-seek-forward-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-seek-forward-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-seek-forward-32.png"), QSize(32, 32));
break; break;
case SP_MediaSeekBackward: case SP_MediaSeekBackward:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-seek-backward-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-seek-backward-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-seek-backward-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-seek-backward-32.png"), QSize(32, 32));
break; break;
case SP_MediaSkipForward: case SP_MediaSkipForward:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-skip-forward-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-skip-forward-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-skip-forward-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-skip-forward-32.png"), QSize(32, 32));
break; break;
case SP_MediaSkipBackward: case SP_MediaSkipBackward:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-skip-backward-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-skip-backward-16.png"), QSize(16, 16));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-skip-backward-32.png"), QSize(32, 32)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-skip-backward-32.png"), QSize(32, 32));
break; break;
case SP_MediaVolume: case SP_MediaVolume:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-volume-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-volume-16.png"), QSize(16, 16));
break; break;
case SP_MediaVolumeMuted: case SP_MediaVolumeMuted:
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-volume-muted-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-volume-muted-16.png"), QSize(16, 16));
break; break;
#endif // QT_NO_IMAGEFORMAT_PNG #endif // QT_NO_IMAGEFORMAT_PNG
default: default:

2
src/widgets/styles/qmacstyle_mac.mm
View File

@ -5209,7 +5209,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
} }
if (tb->state & State_On) { if (tb->state & State_On) {
if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) { if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) {
static QPixmap pm(QLatin1String(":/trolltech/mac/style/images/leopard-unified-toolbar-on.png")); static QPixmap pm(QLatin1String(":/qt-project.org/mac/style/images/leopard-unified-toolbar-on.png"));
p->setRenderHint(QPainter::SmoothPixmapTransform); p->setRenderHint(QPainter::SmoothPixmapTransform);
QStyleHelper::drawBorderPixmap(pm, p, tb->rect, 2, 2, 2, 2); QStyleHelper::drawBorderPixmap(pm, p, tb->rect, 2, 2, 2, 2);
} else { } else {

4
src/widgets/styles/qstyle.qrc
View File

@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0"> <!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/trolltech/styles/commonstyle"> <qresource prefix="/qt-project.org/styles/commonstyle">
<file>images/filelink-16.png</file> <file>images/filelink-16.png</file>
<file>images/filelink-32.png</file> <file>images/filelink-32.png</file>
<file>images/filelink-128.png</file> <file>images/filelink-128.png</file>
@ -126,7 +126,7 @@
<file>images/media-volume-16.png</file> <file>images/media-volume-16.png</file>
<file>images/media-volume-muted-16.png</file> <file>images/media-volume-muted-16.png</file>
</qresource> </qresource>
<qresource prefix="/trolltech/styles/macstyle"> <qresource prefix="/qt-project.org/styles/macstyle">
<file>images/closedock-16.png</file> <file>images/closedock-16.png</file>
<file>images/closedock-down-16.png</file> <file>images/closedock-down-16.png</file>
<file>images/dockdock-16.png</file> <file>images/dockdock-16.png</file>

2
src/widgets/styles/qstyle_wince.qrc
View File

@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0"> <!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/trolltech/styles/commonstyle"> <qresource prefix="/qt-project.org/styles/commonstyle">
<file>images/filelink-16.png</file> <file>images/filelink-16.png</file>
<file>images/filelink-32.png</file> <file>images/filelink-32.png</file>
<file>images/file-16.png</file> <file>images/file-16.png</file>

4
src/widgets/widgets/qfontcombobox.cpp
View File

@ -120,8 +120,8 @@ public:
QFontFamilyDelegate::QFontFamilyDelegate(QObject *parent) QFontFamilyDelegate::QFontFamilyDelegate(QObject *parent)
: QAbstractItemDelegate(parent) : QAbstractItemDelegate(parent)
{ {
truetype = QIcon(QLatin1String(":/trolltech/styles/commonstyle/images/fonttruetype-16.png")); truetype = QIcon(QLatin1String(":/qt-project.org/styles/commonstyle/images/fonttruetype-16.png"));
bitmap = QIcon(QLatin1String(":/trolltech/styles/commonstyle/images/fontbitmap-16.png")); bitmap = QIcon(QLatin1String(":/qt-project.org/styles/commonstyle/images/fontbitmap-16.png"));
writingSystem = QFontDatabase::Any; writingSystem = QFontDatabase::Any;
} }

8
tests/auto/tools/uic/baseline/tabbedbrowser.ui
View File

@ -99,7 +99,7 @@
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="assistant.qrc" >:/trolltech/assistant/images/close.png</iconset> <iconset resource="assistant.qrc" >:/qt-project.org/assistant/images/close.png</iconset>
</property> </property>
<property name="autoRaise" > <property name="autoRaise" >
<bool>true</bool> <bool>true</bool>
@ -130,7 +130,7 @@
<string>Previous</string> <string>Previous</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="assistant.qrc" >:/trolltech/assistant/images/win/previous.png</iconset> <iconset resource="assistant.qrc" >:/qt-project.org/assistant/images/win/previous.png</iconset>
</property> </property>
<property name="toolButtonStyle" > <property name="toolButtonStyle" >
<enum>Qt::ToolButtonTextBesideIcon</enum> <enum>Qt::ToolButtonTextBesideIcon</enum>
@ -152,7 +152,7 @@
<string>Next</string> <string>Next</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="assistant.qrc" >:/trolltech/assistant/images/win/next.png</iconset> <iconset resource="assistant.qrc" >:/qt-project.org/assistant/images/win/next.png</iconset>
</property> </property>
<property name="toolButtonStyle" > <property name="toolButtonStyle" >
<enum>Qt::ToolButtonTextBesideIcon</enum> <enum>Qt::ToolButtonTextBesideIcon</enum>
@ -194,7 +194,7 @@
</size> </size>
</property> </property>
<property name="text" > <property name="text" >
<string>&lt;img src=":/trolltech/assistant/images/wrap.png">&amp;nbsp;Search wrapped</string> <string>&lt;img src=":/qt-project.org/assistant/images/wrap.png">&amp;nbsp;Search wrapped</string>
</property> </property>
<property name="textFormat" > <property name="textFormat" >
<enum>Qt::RichText</enum> <enum>Qt::RichText</enum>

8
tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
View File

@ -125,7 +125,7 @@ public:
hboxLayout->setObjectName(QStringLiteral("hboxLayout")); hboxLayout->setObjectName(QStringLiteral("hboxLayout"));
toolClose = new QToolButton(frameFind); toolClose = new QToolButton(frameFind);
toolClose->setObjectName(QStringLiteral("toolClose")); toolClose->setObjectName(QStringLiteral("toolClose"));
const QIcon icon = QIcon(QString::fromUtf8(":/trolltech/assistant/images/close.png")); const QIcon icon = QIcon(QString::fromUtf8(":/qt-project.org/assistant/images/close.png"));
toolClose->setIcon(icon); toolClose->setIcon(icon);
toolClose->setAutoRaise(true); toolClose->setAutoRaise(true);
@ -144,7 +144,7 @@ public:
toolPrevious = new QToolButton(frameFind); toolPrevious = new QToolButton(frameFind);
toolPrevious->setObjectName(QStringLiteral("toolPrevious")); toolPrevious->setObjectName(QStringLiteral("toolPrevious"));
const QIcon icon1 = QIcon(QString::fromUtf8(":/trolltech/assistant/images/win/previous.png")); const QIcon icon1 = QIcon(QString::fromUtf8(":/qt-project.org/assistant/images/win/previous.png"));
toolPrevious->setIcon(icon1); toolPrevious->setIcon(icon1);
toolPrevious->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); toolPrevious->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
toolPrevious->setAutoRaise(true); toolPrevious->setAutoRaise(true);
@ -154,7 +154,7 @@ public:
toolNext = new QToolButton(frameFind); toolNext = new QToolButton(frameFind);
toolNext->setObjectName(QStringLiteral("toolNext")); toolNext->setObjectName(QStringLiteral("toolNext"));
toolNext->setMinimumSize(QSize(0, 0)); toolNext->setMinimumSize(QSize(0, 0));
const QIcon icon2 = QIcon(QString::fromUtf8(":/trolltech/assistant/images/win/next.png")); const QIcon icon2 = QIcon(QString::fromUtf8(":/qt-project.org/assistant/images/win/next.png"));
toolNext->setIcon(icon2); toolNext->setIcon(icon2);
toolNext->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); toolNext->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
toolNext->setAutoRaise(true); toolNext->setAutoRaise(true);
@ -204,7 +204,7 @@ public:
toolNext->setText(QApplication::translate("TabbedBrowser", "Next", 0, QApplication::UnicodeUTF8)); toolNext->setText(QApplication::translate("TabbedBrowser", "Next", 0, QApplication::UnicodeUTF8));
checkCase->setText(QApplication::translate("TabbedBrowser", "Case Sensitive", 0, QApplication::UnicodeUTF8)); checkCase->setText(QApplication::translate("TabbedBrowser", "Case Sensitive", 0, QApplication::UnicodeUTF8));
checkWholeWords->setText(QApplication::translate("TabbedBrowser", "Whole words", 0, QApplication::UnicodeUTF8)); checkWholeWords->setText(QApplication::translate("TabbedBrowser", "Whole words", 0, QApplication::UnicodeUTF8));
labelWrapped->setText(QApplication::translate("TabbedBrowser", "<img src=\":/trolltech/assistant/images/wrap.png\">&nbsp;Search wrapped", 0, QApplication::UnicodeUTF8)); labelWrapped->setText(QApplication::translate("TabbedBrowser", "<img src=\":/qt-project.org/assistant/images/wrap.png\">&nbsp;Search wrapped", 0, QApplication::UnicodeUTF8));
} // retranslateUi } // retranslateUi
}; };

36
tests/auto/widgets/kernel/qicon/tst_qicon.cpp
View File

@ -374,32 +374,32 @@ void tst_QIcon::detach()
void tst_QIcon::addFile() void tst_QIcon::addFile()
{ {
QIcon icon; QIcon icon;
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-32.png")); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-32.png"));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-128.png")); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-128.png"));
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-16.png"), QSize(), QIcon::Selected); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png"), QSize(), QIcon::Selected);
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-32.png"), QSize(), QIcon::Selected); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-32.png"), QSize(), QIcon::Selected);
icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-128.png"), QSize(), QIcon::Selected); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-128.png"), QSize(), QIcon::Selected);
#ifndef Q_OS_WINCE #ifndef Q_OS_WINCE
QVERIFY(icon.pixmap(16, QIcon::Normal).toImage() == QVERIFY(icon.pixmap(16, QIcon::Normal).toImage() ==
QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")).toImage()); QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")).toImage());
QVERIFY(icon.pixmap(32, QIcon::Normal).toImage() == QVERIFY(icon.pixmap(32, QIcon::Normal).toImage() ==
QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-32.png")).toImage()); QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-32.png")).toImage());
QVERIFY(icon.pixmap(128, QIcon::Normal).toImage() == QVERIFY(icon.pixmap(128, QIcon::Normal).toImage() ==
QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-128.png")).toImage()); QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-128.png")).toImage());
QVERIFY(icon.pixmap(16, QIcon::Selected).toImage() == QVERIFY(icon.pixmap(16, QIcon::Selected).toImage() ==
QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-16.png")).toImage()); QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png")).toImage());
QVERIFY(icon.pixmap(32, QIcon::Selected).toImage() == QVERIFY(icon.pixmap(32, QIcon::Selected).toImage() ==
QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-32.png")).toImage()); QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-32.png")).toImage());
QVERIFY(icon.pixmap(128, QIcon::Selected).toImage() == QVERIFY(icon.pixmap(128, QIcon::Selected).toImage() ==
QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-128.png")).toImage()); QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-128.png")).toImage());
#else #else
// WinCE only includes the 16x16 images for size reasons // WinCE only includes the 16x16 images for size reasons
QVERIFY(icon.pixmap(16, QIcon::Normal).toImage() == QVERIFY(icon.pixmap(16, QIcon::Normal).toImage() ==
QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")).toImage()); QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")).toImage());
QVERIFY(icon.pixmap(16, QIcon::Selected).toImage() == QVERIFY(icon.pixmap(16, QIcon::Selected).toImage() ==
QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-16.png")).toImage()); QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png")).toImage());
#endif #endif
} }
@ -436,7 +436,7 @@ void tst_QIcon::availableSizes()
{ {
// we try to load an icon from resources // we try to load an icon from resources
QIcon icon(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); QIcon icon(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
QList<QSize> availableSizes = icon.availableSizes(); QList<QSize> availableSizes = icon.availableSizes();
QCOMPARE(availableSizes.size(), 1); QCOMPARE(availableSizes.size(), 1);
QCOMPARE(availableSizes.at(0), QSize(16, 16)); QCOMPARE(availableSizes.at(0), QSize(16, 16));
@ -445,7 +445,7 @@ void tst_QIcon::availableSizes()
{ {
// load an icon from binary data. // load an icon from binary data.
QPixmap pix; QPixmap pix;
QFile file(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); QFile file(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
QVERIFY(file.open(QIODevice::ReadOnly)); QVERIFY(file.open(QIODevice::ReadOnly));
uchar *data = file.map(0, file.size()); uchar *data = file.map(0, file.size());
QVERIFY(data != 0); QVERIFY(data != 0);
@ -617,12 +617,12 @@ void tst_QIcon::fromTheme()
void tst_QIcon::task223279_inconsistentAddFile() void tst_QIcon::task223279_inconsistentAddFile()
{ {
QIcon icon1; QIcon icon1;
icon1.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); icon1.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
icon1.addFile(QLatin1String("IconThatDoesntExist"), QSize(32, 32)); icon1.addFile(QLatin1String("IconThatDoesntExist"), QSize(32, 32));
QPixmap pm1 = icon1.pixmap(32, 32); QPixmap pm1 = icon1.pixmap(32, 32);
QIcon icon2; QIcon icon2;
icon2.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); icon2.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
icon2.addFile(QLatin1String("IconThatDoesntExist")); icon2.addFile(QLatin1String("IconThatDoesntExist"));
QPixmap pm2 = icon1.pixmap(32, 32); QPixmap pm2 = icon1.pixmap(32, 32);