muesli

diff --git a/src/utils/libvlc.cpp b/src/utils/libvlc.cpp
index 69d626e..e4ee996 100644
--- a/src/utils/libvlc.cpp
+++ b/src/utils/libvlc.cpp
@@ -107,19 +107,19 @@ bool LibVLC::init()
         // appropriate output should be loaded. This is to prevent cases where
         // one has only an AudioOutput but plays a video, in which case libvlc
         // would open a separate window for the video.
-        args << "--vout=vdummy";
-        args << "--aout=adummy";

muesli

diff --git a/src/utils/libvlc.cpp b/src/utils/libvlc.cpp
index 69d626e..9cd31df 100644
--- a/src/utils/libvlc.cpp
+++ b/src/utils/libvlc.cpp
@@ -112,6 +112,7 @@ bool LibVLC::init()
         // Do not preload services discovery modules, we don't use them.
         args << "--services-discovery=''";
         // Allow multiple starts (one gets to wonder whether that makes a difference.
+#ifndef Q_OS_MAC
         args << "--no-one-instance";

muesli

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 63bbd29..646053a 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -502,7 +502,7 @@ static int qCocoaViewCount = 0;
     // and not just the one on top. Therefore, to we cannot use qwidget
     // as native widget for this case. Instead, we let qt_mac_handleMouseEvent
     // resolve it (last argument set to 0):
-    qt_mac_handleMouseEvent(nsmoveEvent, QEvent::MouseMove, Qt::NoButton, 0, true);
+    qt_mac_handleMouseEvent(nsmoveEvent, QEvent::MouseMove, Qt::NoButton, 0);

muesli

diff --git a/src/utils/libvlc.cpp b/src/utils/libvlc.cpp
index 93ca4ad..1e1582b 100644
--- a/src/utils/libvlc.cpp
+++ b/src/utils/libvlc.cpp
@@ -92,7 +92,7 @@ bool LibVLC::init()
     args << "--services-discovery=''";
     // Allow multiple starts (one gets to wonder whether that makes a difference).
 #if (LIBVLC_VERSION_INT > LIBVLC_VERSION(2, 1, 0, 0) && defined(Q_OS_MAC)) || defined( Q_OS_WIN) || !defined(PHONON_NO_DBUS)
-    args << "--no-one-instance";
+//    args << "--no-one-instance";

muesli

--- ../phonon-backend-vlc-0.7.1/src/utils/libvlc.cpp    2013-12-06 11:23:05.000000000 +0100
+++ ./src/utils/libvlc.cpp      2014-01-25 16:38:13.528310339 +0100
@@ -94,7 +94,7 @@
     // Do not preload services discovery modules, we don't use them.
     args << "--services-discovery=''";
     // Allow multiple starts (one gets to wonder whether that makes a difference).
-#if (LIBVLC_VERSION_INT > LIBVLC_VERSION(2, 1, 0, 0) && defined(Q_OS_MAC)) || defined( Q_OS_WIN) || !defined(PHONON_NO_DBUS)
+#if !defined(Q_OS_MAC) && (defined(Q_OS_WIN) || !defined(PHONON_NO_DBUS))
     args << "--no-one-instance";
 #endif

muesli

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96183e3..52d5219 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,12 +113,12 @@ include_directories(
   "${CMAKE_CURRENT_BINARY_DIR}/include"
 )
 
-enable_testing()
+#enable_testing()

muesli

diff -u -N LucenePlusPlus-rel_3.0.6/CMakeLists.txt LucenePlusPlus-rel_3.0.6.new/CMakeLists.txt
--- LucenePlusPlus-rel_3.0.6/CMakeLists.txt	2014-04-19 20:26:40.000000000 +0200
+++ LucenePlusPlus-rel_3.0.6.new/CMakeLists.txt	2014-09-16 03:23:52.000000000 +0200
@@ -114,12 +114,12 @@
 )
 
 include(CMakeExternal.txt)
-enable_testing()
+#enable_testing()
 

muesli

Index: quazip/quazip/CMakeLists.txt
===================================================================
--- quazip/quazip/CMakeLists.txt        (revision 251)
+++ quazip/quazip/CMakeLists.txt        (working copy)
@@ -17,7 +17,7 @@
 add_library(quazip SHARED ${SRCS})
 set_target_properties(quazip PROPERTIES VERSION 1.0.0 SOVERSION 1)
 # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
-target_link_libraries(quazip ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES})
+target_link_libraries(quazip ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})

muesli

diff --git a/qtbase/src/corelib/global/qcompilerdetection.h b/qtbase/src/corelib/global/qcompilerdetection.h
index 4c84daa..5f8ca5c 100644
--- a/qtbase/src/corelib/global/qcompilerdetection.h
+++ b/qtbase/src/corelib/global/qcompilerdetection.h
@@ -154,17 +154,17 @@
 /* Clang also masquerades as GCC */
 #    if defined(__apple_build_version__)
 #      /* http://en.wikipedia.org/wiki/Xcode#Toolchain_Versions */
-#      if __apple_build_version__ >= 600051
+#      if __apple_build_version__ >= 6000051

muesli

/*
 * knoxite
 *     Copyright (c) 2016, Christian Muehlhaeuser <[email protected]>
 *
 *   For license see LICENSE.txt
 */

package knoxite

import (