diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index 5dfa1b33..787b195b 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -12,8 +12,8 @@ linux-g++-64 { VERSION_MAJ = 1 VERSION_MIN = 40 -VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error -VERSION_PATCH = 01 +VERSION_TYPE = a # a = alpha, b = beta, r = release, other => error +VERSION_PATCH = 00 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = $$replace(VERSION, "\\.r", "") diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp index 641ac162..62ea98c8 100644 --- a/src/gui/UBMediaPlayer.cpp +++ b/src/gui/UBMediaPlayer.cpp @@ -102,8 +102,8 @@ UBMediaPlayer::UBMediaPlayer() : vLayout->addWidget(&m_videoWindow); // m_videoWidget->setStyleSheet(QString("background:red;")); QVBoxLayout *buttonPanelLayout = new QVBoxLayout(); -#ifdef Q_WS_MAC - m_videoWindow.hide(); +#ifndef Q_WS_WIN + m_videoWindow.hide(); #endif // buttonPanelLayout->addLayout(layout); diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index cfdf18ce..3a9a8a75 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -386,7 +386,7 @@ void UBTeacherBarWidget::loadContent() mpPreview->mediaViewer()->loadWidgets(widgetList,false); int loadedMedia = mpPreview->mediaViewer()->loadMedia(nextInfos.medias); if(loadedMedia) - mpPreview->mediaLabel()->setVisible(true); + mpPreview->mediaLabel()->setVisible(true); }