diff options
| author | Paweł Jastrzębski <[email protected]> | 2013-10-12 17:54:21 +0200 |
|---|---|---|
| committer | Paweł Jastrzębski <[email protected]> | 2013-10-12 17:54:21 +0200 |
| commit | fceac407eea6752566ff6fc10ea59a886e263a81 (patch) | |
| tree | 122cdaa1acf6ee60b58e1f1b7f5039c2763d8117 /other | |
| parent | GUI update (diff) | |
| download | kcc-fceac407eea6752566ff6fc10ea59a886e263a81.tar.gz kcc-fceac407eea6752566ff6fc10ea59a886e263a81.tar.bz2 kcc-fceac407eea6752566ff6fc10ea59a886e263a81.zip | |
Updated OSX setup
Diffstat (limited to 'other')
| -rw-r--r-- | other/QT-4.8.5-QListWidget.patch | 24 | ||||
| -rw-r--r-- | other/qt.conf | 2 |
2 files changed, 11 insertions, 15 deletions
diff --git a/other/QT-4.8.5-QListWidget.patch b/other/QT-4.8.5-QListWidget.patch index 5bb9688..130e562 100644 --- a/other/QT-4.8.5-QListWidget.patch +++ b/other/QT-4.8.5-QListWidget.patch @@ -1,37 +1,35 @@ ---- qt-4.8.5/src/gui/kernel/qwidget_mac.mm 2011-12-15 10:38:21.000000000 -0800 -+++ qt-4.8.5/src/gui/kernel/qwidget_mac.mm 2012-09-18 17:17:03.000000000 -0700 -@@ -1,22 +1,41 @@ - -@@ -4684,15 +4703,14 @@ +--- qt-4.8.5/src/gui/kernel/qwidget_mac.mm 2013-06-07 07:16:59.000000000 +0200 ++++ qt-4.8.5-fix/src/gui/kernel/qwidget_mac.mm 2013-10-11 23:00:15.000000000 +0200 +@@ -4715,15 +4715,13 @@ void QWidgetPrivate::scroll_sys(int dx, } - + // Scroll the whole widget if qscrollRect is not valid: - QRect validScrollRect = qscrollRect.isValid() ? qscrollRect : q->rect(); - validScrollRect &= clipRect(); + QRect validScrollRect = qscrollRect.isValid() ? qscrollRect : QRect(0, 0, q->width(), q->height()); - + // If q is overlapped by other widgets, we cannot just blit pixels since // this will move overlapping widgets as well. In case we just update: const bool overlapped = isOverlapped(validScrollRect.translated(data.crect.topLeft())); const bool accelerateScroll = accelEnv && isOpaque && !overlapped; const bool isAlien = (q->internalWinId() == 0); - const QPoint scrollDelta(dx, dy); -+ - + // If qscrollRect is valid, we are _not_ supposed to scroll q's children (as documented). // But we do scroll children (and the whole of q) if qscrollRect is invalid. This case is -@@ -4714,7 +4732,6 @@ +@@ -4745,7 +4743,6 @@ void QWidgetPrivate::scroll_sys(int dx, }else { update_sys(qscrollRect); } - return; } - + #ifdef QT_MAC_USE_COCOA -@@ -4731,6 +4748,7 @@ +@@ -4762,6 +4759,7 @@ void QWidgetPrivate::scroll_sys(int dx, // moved when the parent is scrolled. All directly or indirectly moved // children will receive a move event before the function call returns. QWidgetList movedChildren; + const QPoint scrollDelta(dx, dy); if (scrollChildren) { - QObjectList children = q->children(); \ No newline at end of file + QObjectList children = q->children(); + diff --git a/other/qt.conf b/other/qt.conf deleted file mode 100644 index bbb0228..0000000 --- a/other/qt.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Paths] -Plugins = DumbHackThatFixPY2APP |