mirror of
https://github.com/mapmapteam/mapmap.git
synced 2026-06-16 12:33:19 +02:00
Fix compilation errors
This commit is contained in:
@@ -30,7 +30,6 @@ Install GStreamer 1.0 libraries and plugins::
|
||||
sudo apt-get install -y \
|
||||
libgstreamer1.0-dev \
|
||||
libgstreamer-plugins-base1.0-dev \
|
||||
gstreamer1.0-gnonlin \
|
||||
gstreamer1.0-plugins-bad \
|
||||
gstreamer1.0-libav \
|
||||
gstreamer1.0-vaapi \
|
||||
@@ -84,7 +83,7 @@ NOTE: This has been tested on OS X 10.11 (El Capitan).
|
||||
Install tools and dependencies:
|
||||
|
||||
1) Install the Apple Developer Tools
|
||||
- You need to register with a credit card in the Apple Store in order to download it (no need to pay, but Apple needs your soul).
|
||||
- You need to register with a credit card in the Apple Store in order to download it (no need to pay, but Apple requires your credit card number).
|
||||
2) Install Qt5
|
||||
- You can get the open source version from http://www.qt.io/download-open-source/
|
||||
- Run the installer and choose the default location (which should be ~/Qt).
|
||||
|
||||
+3
-2
@@ -612,10 +612,11 @@ void MapperGLCanvas::wheelEvent(QWheelEvent *event)
|
||||
// Accept wheel scrolling event.
|
||||
event->accept();
|
||||
} else { // control is not pressed: scroll
|
||||
QScrollBar* scrollbar;
|
||||
if (shift_is_pressed) { // shift is pressed: pans horizontally
|
||||
QScrollBar* const scrollbar = this->horizontalScrollBar();
|
||||
scrollbar = this->horizontalScrollBar();
|
||||
} else { // shift is not pressed: scrolls vertically
|
||||
QScrollBar* const scrollbar = this->verticalScrollBar();
|
||||
scrollbar = this->verticalScrollBar();
|
||||
}
|
||||
// FIXME: scrolling with the mouse doesn't currently work
|
||||
int scroll = scrollbar->value();
|
||||
|
||||
Reference in New Issue
Block a user