From 40663c0945f9f9c3dce47f31640399f0f26c0e01 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 12 Mar 2016 14:49:30 +0100 Subject: [PATCH] Fix for Qt5 --- data/windows/build-win32.sh | 2 +- source/widgets/draggablegraphicsview.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/windows/build-win32.sh b/data/windows/build-win32.sh index 3bc58e2b7..a18653098 100755 --- a/data/windows/build-win32.sh +++ b/data/windows/build-win32.sh @@ -3,7 +3,7 @@ ### fluidsynth.pc: # -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lm -ldsound -lwinmm -lole32 -lws2_32 ### linuxsampler.pc: -# -L${prefix}/lib/libgig -llinuxsampler -lgig -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lm -lrpcrt4 +# -L${prefix}/lib/libgig -lgig -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lm -lrpcrt4 set -e diff --git a/source/widgets/draggablegraphicsview.py b/source/widgets/draggablegraphicsview.py index 31b983e72..cbf32b9ba 100644 --- a/source/widgets/draggablegraphicsview.py +++ b/source/widgets/draggablegraphicsview.py @@ -26,8 +26,8 @@ from carla_config import * if config_UseQt5: from PyQt5.QtCore import Qt - from PyQt5.QtGui import QCursor - from PyQt5.QtWidgets import QGraphicsView, QMouseEvent + from PyQt5.QtGui import QCursor, QMouseEvent + from PyQt5.QtWidgets import QGraphicsView else: from PyQt4.QtCore import Qt from PyQt4.QtGui import QCursor, QGraphicsView, QMouseEvent