Merge pull request #2108 from LMMS/travis-qt5

Travis QT5

src/CMakeLists.txt

@@ -115,14 +115,6 @@ TARGET_LINK_LIBRARIES(lmms
 	${LMMS_REQUIRED_LIBS}
 )
 
-IF(QT5)
-	TARGET_LINK_LIBRARIES(lmms
-		Qt5::Widgets
-		Qt5::Xml
-)
-ENDIF()
-
-
 #
 # rules for building localizations
 #

src/core/BufferManager.cpp

@@ -31,9 +31,9 @@
 #include "MemoryManager.h"
 
 sampleFrame ** BufferManager::s_available;
-QAtomicInt BufferManager::s_availableIndex = 0;
+AtomicInt BufferManager::s_availableIndex = 0;
 sampleFrame ** BufferManager::s_released;
-QAtomicInt BufferManager::s_releasedIndex = 0;
+AtomicInt BufferManager::s_releasedIndex = 0;
 //QReadWriteLock BufferManager::s_mutex;
 int BufferManager::s_size;
 

src/core/ConfigManager.cpp

@@ -31,6 +31,7 @@
 #include "ConfigManager.h"
 #include "MainWindow.h"
 #include "ProjectVersion.h"
+#include "GuiApplication.h"
 
 
 static inline QString ensureTrailingSlash( const QString & _s )
@@ -340,7 +341,7 @@ void ConfigManager::loadConfigFile()
 		#endif
 			setBackgroundArtwork( value( "paths", "backgroundartwork" ) );
 		}
-		else if( QApplication::type() == QApplication::GuiClient )
+		else if( gui )
 		{
 			QMessageBox::warning( NULL, MainWindow::tr( "Configuration file" ),
 									MainWindow::tr( "Error while parsing configuration file at line %1:%2: %3" ).
@@ -401,8 +402,7 @@ void ConfigManager::loadConfigFile()
 	searchPaths << artworkDir() << defaultArtworkDir();
 	QDir::setSearchPaths( "resources", searchPaths);
 
-	if( !QDir( m_workingDir ).exists() &&
-		QApplication::type() == QApplication::GuiClient &&
+	if( !QDir( m_workingDir ).exists() && gui &&
 		QMessageBox::question( 0,
 			MainWindow::tr( "Working directory" ),
 			MainWindow::tr( "The LMMS working directory %1 does not "

src/core/NotePlayHandle.cpp

@@ -559,7 +559,7 @@ void NotePlayHandle::resize( const bpm_t _new_tempo )
 
 NotePlayHandle ** NotePlayHandleManager::s_available;
 QReadWriteLock NotePlayHandleManager::s_mutex;
-QAtomicInt NotePlayHandleManager::s_availableIndex;
+AtomicInt NotePlayHandleManager::s_availableIndex;
 int NotePlayHandleManager::s_size;
 
 

src/core/Plugin.cpp

@@ -25,7 +25,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QLibrary>
-#include <QtGui/QMessageBox>
+#include <QMessageBox>
 
 #include "Plugin.h"
 #include "embed.h"

src/core/base64.cpp

@@ -28,6 +28,7 @@
 #include "base64.h"
 
 #include <QBuffer>
+#include <QDataStream>
 #include <QVariant>
 
 namespace base64

src/gui/dialogs/FileDialog.cpp

@@ -35,7 +35,7 @@ FileDialog::FileDialog( QWidget *parent, const QString &caption,
 					   const QString &directory, const QString &filter ) :
 	QFileDialog( parent, caption, directory, filter )
 {
-#if QT_VERSION >= 0x040806
+#if (QT_VERSION >= 0x040806 && QT_VERSION < 0x050000) || QT_VERSION > 0x050200
 	setOption( QFileDialog::DontUseCustomDirectoryIcons );
 #endif