diff options
| -rw-r--r-- | other/QT-4.8.5-QListWidget.patch | 35 | ||||
| -rw-r--r-- | setup.py | 6 |
2 files changed, 3 insertions, 38 deletions
diff --git a/other/QT-4.8.5-QListWidget.patch b/other/QT-4.8.5-QListWidget.patch deleted file mode 100644 index 130e562..0000000 --- a/other/QT-4.8.5-QListWidget.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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 -@@ -4745,7 +4743,6 @@ void QWidgetPrivate::scroll_sys(int dx, - }else { - update_sys(qscrollRect); - } -- return; - } - - #ifdef QT_MAC_USE_COCOA -@@ -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(); - diff --git a/setup.py b/setup.py index c8a6e38..3c83f75 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ elif platform == "win32": ['other/7za.exe', '7za.exe'], ['other/Additional-LICENSE.txt', 'Additional-LICENSE.txt'] ], "compressed": True, - "excludes": ['Tkinter']}}, + "excludes": ['tkinter']}}, executables=[Executable(MAIN, base=base, targetName="KCC.exe", @@ -89,7 +89,7 @@ setup( if platform == "darwin": from os import chmod, makedirs from shutil import copyfile - makedirs('dist/' + NAME + '.app/Contents/PlugIns/platform') - copyfile('other/libqcocoa.dylib', 'dist/' + NAME + '.app/Contents/PlugIns/platform') + makedirs('dist/' + NAME + '.app/Contents/PlugIns/platforms') + copyfile('other/libqcocoa.dylib', 'dist/' + NAME + '.app/Contents/PlugIns/platforms/libqcocoa.dylib') chmod('dist/' + NAME + '.app/Contents/Resources/unrar', 0o777) chmod('dist/' + NAME + '.app/Contents/Resources/7za', 0o777) \ No newline at end of file |