nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 08:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

QT5 -- 1 of 3

Browse Source 
Porting the codebase to QT 5 (5.2) to get the
latest bug fixes, performance and improved platform
support.

This first part is to fixup the codebase to compile
on Qt 5, but some aspects have been broken (video).

The second part is to migrate from Qwt 6.0.1 to the
latest Qwt for multiaxis support.

The third part will be to fixup any platform specific
issues or issues identified at runtime.
This commit is contained in:
Mark Liversedge
2013-12-09 09:57:13 +00:00
parent 2cadf4a374
commit 82baf90131
186 changed files with 552 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/VideoWindow.cpp
View File

@@ -23,8 +23,7 @@ VideoWindow::VideoWindow(Context *context, const QDir &home) :
GcWindow(context), home(home), context(context), m_MediaChanged(false)
{
setControls(NULL);
setInstanceName("Video Window");
setProperty("color", Qt::black);
setProperty("color", QColor(Qt::black));
QHBoxLayout *layout = new QHBoxLayout();
setLayout(layout);
@@ -64,7 +63,7 @@ VideoWindow::VideoWindow(Context *context, const QDir &home) :
/* This is a non working code that show how to hooks into a window,
* if we have a window around */
#ifdef Q_OS_LINUX
x11Container = new QX11EmbedContainer(this);
x11Container = new QWidget(this); //XXX PORT TO 5.1 BROKEN CODE XXX
layout->addWidget(x11Container);
libvlc_media_player_set_xwindow (mp, x11Container->winId());
#endif
@@ -87,7 +86,7 @@ VideoWindow::~VideoWindow()
{
#ifdef Q_OS_LINUX
// unembed vlc backend first
x11Container->discardClient();
//x11Container->discardClient(); //XXX PORT TO QT 5.1 BROKEN CODE XXX
#endif
stopPlayback();