mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-04-01 21:04:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added initial Qt5 support

Browse Source 
LMMS now properly builds and runs with Qt5. Various deprecated functions
had to be replaced like QString::toAscii()/fromAscii(). Also occurences
of FALSE/TRUE have been replaced with false/true.

LmmsStyle now derives from QProxyStyle and sets a style instance as base
style (Plastique for Qt4, Fusion for Qt5).

MOC files are not included anymore but added as regular source files.

What's missing is support for embedding VST plugins into a subwindow
inside LMMS on Linux/X11 due to missing QX11EmbedContainer class in Qt5.

Build instructions can be found in INSTALL.Qt5

Minimum version requirement for Qt4 has been raised to 4.6.0 for best
API compatibility between Qt4 and Qt5.
This commit is contained in:
Tobias Doerffel
2014-08-14 17:26:05 +02:00
parent dea2631035
commit 4cee046909
284 changed files with 1043 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/gui/MainWindow.cpp
View File

@@ -23,17 +23,17 @@
*/
#include <QtXml/QDomElement>
#include <QtCore/QUrl>
#include <QtGui/QApplication>
#include <QtGui/QCloseEvent>
#include <QtGui/QDesktopServices>
#include <QtGui/QMdiArea>
#include <QtGui/QMdiSubWindow>
#include <QtGui/QMenuBar>
#include <QtGui/QMessageBox>
#include <QtGui/QSplitter>
#include <QtGui/QWhatsThis>
#include <QDomElement>
#include <QUrl>
#include <QApplication>
#include <QCloseEvent>
#include <QDesktopServices>
#include <QMdiArea>
#include <QMdiSubWindow>
#include <QMenuBar>
#include <QMessageBox>
#include <QSplitter>
#include <QWhatsThis>
#include "lmmsversion.h"
#include "MainWindow.h"
@@ -91,7 +91,7 @@ MainWindow::MainWindow() :
SideBar * sideBar = new SideBar( Qt::Vertical, w );
QSplitter * splitter = new QSplitter( Qt::Horizontal, w );
splitter->setChildrenCollapsible( FALSE );
splitter->setChildrenCollapsible( false );
QString wdir = configManager::inst()->workingDir();
sideBar->appendTab( new pluginBrowser( splitter ) );
@@ -319,7 +319,7 @@ void MainWindow::finalize()
QMenu * help_menu = new QMenu( this );
menuBar()->addMenu( help_menu )->setText( tr( "&Help" ) );
// May use offline help
if( TRUE )
if( true )
{
help_menu->addAction( embed::getIconPixmap( "help" ),
tr( "Online help" ),
@@ -580,7 +580,7 @@ bool MainWindow::mayChangeProject()
if( !engine::getSong()->isModified() )
{
return( TRUE );
return( true );
}
QMessageBox mb( tr( "Project not saved" ),
@@ -600,10 +600,10 @@ bool MainWindow::mayChangeProject()
}
else if( answer == QMessageBox::Discard )
{
return( TRUE );
return( true );
}
return( FALSE );
return( false );
}
@@ -611,9 +611,9 @@ bool MainWindow::mayChangeProject()
void MainWindow::clearKeyModifiers()
{
m_keyMods.m_ctrl = FALSE;
m_keyMods.m_shift = FALSE;
m_keyMods.m_alt = FALSE;
m_keyMods.m_ctrl = false;
m_keyMods.m_shift = false;
m_keyMods.m_alt = false;
}
@@ -766,7 +766,7 @@ bool MainWindow::saveProject()
{
engine::getSong()->guiSaveProject();
}
return( TRUE );
return( true );
}
@@ -793,9 +793,9 @@ bool MainWindow::saveProjectAs()
{
engine::getSong()->guiSaveProjectAs(
sfd.selectedFiles()[0] );
return( TRUE );
return( true );
}
return( FALSE );
return( false );
}
@@ -1020,9 +1020,9 @@ void MainWindow::keyPressEvent( QKeyEvent * _ke )
{
switch( _ke->key() )
{
case Qt::Key_Control: m_keyMods.m_ctrl = TRUE; break;
case Qt::Key_Shift: m_keyMods.m_shift = TRUE; break;
case Qt::Key_Alt: m_keyMods.m_alt = TRUE; break;
case Qt::Key_Control: m_keyMods.m_ctrl = true; break;
case Qt::Key_Shift: m_keyMods.m_shift = true; break;
case Qt::Key_Alt: m_keyMods.m_alt = true; break;
default:
{
InstrumentTrackWindow * w =
@@ -1046,9 +1046,9 @@ void MainWindow::keyReleaseEvent( QKeyEvent * _ke )
{
switch( _ke->key() )
{
case Qt::Key_Control: m_keyMods.m_ctrl = FALSE; break;
case Qt::Key_Shift: m_keyMods.m_shift = FALSE; break;
case Qt::Key_Alt: m_keyMods.m_alt = FALSE; break;
case Qt::Key_Control: m_keyMods.m_ctrl = false; break;
case Qt::Key_Shift: m_keyMods.m_shift = false; break;
case Qt::Key_Alt: m_keyMods.m_alt = false; break;
default:
if( InstrumentTrackView::topLevelInstrumentTrackWindow() )
{
@@ -1149,5 +1149,5 @@ void MainWindow::autoSave()
}
#include "moc_MainWindow.cxx"