diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-29 00:57:12 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-29 00:58:13 +0100 |
| commit | c4ad58ed2252d5ed9f448a5c068ab33dce4cadd9 (patch) | |
| tree | 7e9802171d7b4c641c2de1ef781023cab5d7d14c /doc | |
| parent | 7da3a61b5fd5cc726f8fd62691aa5f84c7929800 (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Change-Id: I97ba222435ff50a9e5422e6f2c73e4bb8d1b865c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_gui_kernel_qevent.cpp | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp b/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp index 9fa9a23234..9de685a7b5 100644 --- a/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp +++ b/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp @@ -76,7 +76,7 @@ extern "C" MY_EXPORT int avg(int a, int b) //! [4] -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #define MY_EXPORT __declspec(dllexport) #else #define MY_EXPORT diff --git a/doc/src/snippets/code/src_gui_kernel_qevent.cpp b/doc/src/snippets/code/src_gui_kernel_qevent.cpp index 35c53337f4..d8bdeebe84 100644 --- a/doc/src/snippets/code/src_gui_kernel_qevent.cpp +++ b/doc/src/snippets/code/src_gui_kernel_qevent.cpp @@ -41,14 +41,16 @@ //! [0] void MyWidget::wheelEvent(QWheelEvent *event) { - int numDegrees = event->delta() / 8; - int numSteps = numDegrees / 15; + QPoint numPixels = envent->pixelDelta(); + QPoint numDegrees = envent->angleDelta() / 8; - if (event->orientation() == Qt::Horizontal) { - scrollHorizontally(numSteps); - } else { - scrollVertically(numSteps); + if (!numPixels.isNull()) { + scrollWithPixels(numpixels); + } else if (!numDegrees.isNull()) { + QPoint numSteps = numDegrees / 15; + scrollWithDegrees(numSteps); } + event->accept(); } //! [0] |