diff options
author | Simo Fält <simo.falt@nokia.com> | 2012-03-28 17:05:48 +0300 |
---|---|---|
committer | Simo Fält <simo.falt@nokia.com> | 2012-03-28 17:05:48 +0300 |
commit | 064dc31b190f737e2ae83d3629c31512cb69435c (patch) | |
tree | a73dbe6e68b88bf175e2925e834d6051eb6a90aa /src/plugins | |
parent | 9abfe7031db60bb8e2c16e2fbe92b0950089168c (diff) | |
parent | b754deb055db1b3d74f4ecaed38fa7e59fdcd877 (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoacursor.mm | 8 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuloader.mm | 2 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoaresources.qrc | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm index bd8d32b07e..363c746f41 100644 --- a/src/plugins/platforms/cocoa/qcocoacursor.mm +++ b/src/plugins/platforms/cocoa/qcocoacursor.mm @@ -204,19 +204,19 @@ NSCursor *QCocoaCursor::createCursorData(QCursor *cursor) return createCursorFromPixmap(pixmap); break; } 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); break; } 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); break; } 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); break; } 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); break; } #define QT_USE_APPROXIMATE_CURSORS diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.mm b/src/plugins/platforms/cocoa/qcocoamenuloader.mm index 70e974161e..4993937b91 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuloader.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuloader.mm @@ -82,7 +82,7 @@ void qt_mac_loadMenuNib(QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader) } // 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()) { qWarning("qt_mac_loadMenuNib: could not load nib from resources"); return; diff --git a/src/plugins/platforms/cocoa/qcocoaresources.qrc b/src/plugins/platforms/cocoa/qcocoaresources.qrc index de50d397c6..392300bb03 100644 --- a/src/plugins/platforms/cocoa/qcocoaresources.qrc +++ b/src/plugins/platforms/cocoa/qcocoaresources.qrc @@ -1,15 +1,15 @@ <!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/forbiddencursor.png</file> <file>images/spincursor.png</file> <file>images/waitcursor.png</file> <file>images/pluscursor.png</file> </qresource> -<qresource prefix="/trolltech/mac/style"> +<qresource prefix="/qt-project.org/mac/style"> <file>images/leopard-unified-toolbar-on.png</file> </qresource> -<qresource prefix="/trolltech/mac/"> +<qresource prefix="/qt-project.org/mac/"> <file>qt_menu.nib/classes.nib</file> <file>qt_menu.nib/info.nib</file> <file>qt_menu.nib/keyedobjects.nib</file> |