nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix FullScreen Crash on Mac

Browse Source 
When building with the latest Xcode their is a conflict
between the QtMacSegmentedButton cocoa container and the
same declared in QtMacVideoWindow.

This patch removes QtMacSegmentedButton since we do not
use it.  There appears to be a container in 4.7 anyway
so we no longer declare our own.

Video and FullScreen are fully operational now on 10.6
or higher using 4.7.4 or higher of QT.
This commit is contained in:
Mark Liversedge
2011-11-20 17:10:44 +00:00
parent c5038d87d4
commit 67ea9e2a6b
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/QtMacVideoWindow.mm
View File

@@ -181,9 +181,6 @@ MediaHelper::listMedia(QDir dir)
return returning;
}
#include "QtMacSegmentedButton.h"
static CocoaInitializer cocoaInitializer;
QtMacMovieView::QtMacMovieView (QWidget *parent) : QMacCocoaViewContainer (0, parent)
{
NSRect frame;

4
src/src.pro
View File

@@ -124,8 +124,8 @@ qwt3d {
# Lion fullscreen playback
macx {
LIBS += -lobjc -framework Carbon -framework IOKit -framework AppKit -framework QTKit
HEADERS += QtMacSegmentedButton.h QtMacVideoWindow.h LionFullScreen.h
OBJECTIVE_SOURCES += QtMacSegmentedButton.mm QtMacVideoWindow.mm LionFullScreen.mm
HEADERS += QtMacVideoWindow.h LionFullScreen.h
OBJECTIVE_SOURCES += QtMacVideoWindow.mm LionFullScreen.mm
} else {
# not a mac? then F12 to toggle full screen using
# standard QT showFullScreen / showNormal