diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-27 11:14:48 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-27 11:15:09 +0200 |
| commit | 16a36239ab9e9be45a940aeff94f35e29bdeb944 (patch) | |
| tree | ed6c159f12fa2ff80cf39b97a65eab0546ffe639 /src/plugins/platforms/cocoa/qcocoanativeinterface.h | |
| parent | e37001aad7f6e4bbad250addba033f1eaf97d566 (diff) | |
| parent | 00da2e615e89c46affbc130b4df6148785724a23 (diff) | |
Merge branch 'stable' into dev
Change-Id: I06694436322a7810a163b27b8a059cee2b046f06
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoanativeinterface.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h index 2e5e65f577..d30b281eb8 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h @@ -45,6 +45,7 @@ #include <ApplicationServices/ApplicationServices.h> #include <qpa/qplatformnativeinterface.h> +#include <QtGui/qpixmap.h> QT_BEGIN_NAMESPACE @@ -91,6 +92,11 @@ private: Needed by the native print dialog in the Qt Print Support module. */ Q_INVOKABLE void *NSPrintInfoForPrintEngine(QPrintEngine *printEngine); + /* + Function to return the default background pixmap. + Needed by QWizard in the Qt widget module. + */ + Q_INVOKABLE QPixmap defaultBackgroundPixmapForQWizard(); // QMacPastebardMime support. The mac pasteboard void pointers are // QMacPastebardMime instances from the cocoa plugin or qtmacextras |