diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-10-01 12:56:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-02 08:06:24 +0200 |
| commit | f20266f9f43ab3956de271f696c769db02992e87 (patch) | |
| tree | 30559ada80346c71a2f731a89c829dbdf1bdec14 /src/plugins/platforms | |
| parent | 24c403a2bd71578a1978baed1c60f08c12cd62c5 (diff) | |
fix QWidget::setWindowFilePath on Mac OS
Task-number: QTBUG-27299
Change-Id: I4dddbb9690aac327ad33477d8cea9afa84d10eb3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index 5358a39bc4..20648e8c61 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -101,6 +101,7 @@ public: Qt::WindowFlags setWindowFlags(Qt::WindowFlags flags); Qt::WindowState setWindowState(Qt::WindowState state); void setWindowTitle(const QString &title); + void setWindowFilePath(const QString &filePath); void raise(); void lower(); void propagateSizeHints(); diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 7cebf514c3..daed7c3fde 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -45,6 +45,7 @@ #include "qcocoaglcontext.h" #include "qcocoahelpers.h" #include "qnsview.h" +#include <QtCore/qfileinfo.h> #include <QtCore/private/qcore_mac_p.h> #include <qwindow.h> #include <qpa/qwindowsysteminterface.h> @@ -409,6 +410,16 @@ void QCocoaWindow::setWindowTitle(const QString &title) CFRelease(windowTitle); } +void QCocoaWindow::setWindowFilePath(const QString &filePath) +{ + QCocoaAutoReleasePool pool; + if (!m_nsWindow) + return; + + QFileInfo fi(filePath); + [m_nsWindow setRepresentedFilename: fi.exists() ? QCFString::toNSString(filePath) : @""]; +} + void QCocoaWindow::raise() { //qDebug() << "raise" << this; |