diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
| commit | f7837e28b5f83d116fa43d0401b7188ce27fc346 (patch) | |
| tree | 3de2560e4259f22224f334be17618386860decc7 /src/plugins/platforms/qnx/qqnxnativeinterface.h | |
| parent | 8b0624182bd4998d32c23eded5dbe6dccfd26d5b (diff) | |
| parent | 44a58de2aea6d2ac71efe7261a398effbf139f3f (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/concurrent/qtconcurrentmedian.h
src/corelib/itemmodels/qabstractitemmodel.cpp
Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxnativeinterface.h')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxnativeinterface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/qnx/qqnxnativeinterface.h b/src/plugins/platforms/qnx/qqnxnativeinterface.h index d84df205e5..6692da2576 100644 --- a/src/plugins/platforms/qnx/qqnxnativeinterface.h +++ b/src/plugins/platforms/qnx/qqnxnativeinterface.h @@ -50,6 +50,7 @@ class QQnxNativeInterface : public QPlatformNativeInterface { public: void *nativeResourceForWindow(const QByteArray &resource, QWindow *window); + void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen); }; QT_END_NAMESPACE |