Merge pull request #2108 from LMMS/travis-qt5

Travis QT5

plugins/GigPlayer/GigPlayer.cpp

@@ -1060,7 +1060,7 @@ void GigInstrumentView::showFileDialog()
 
 	QStringList types;
 	types << tr( "GIG Files (*.gig)" );
-	ofd.setFilters( types );
+	ofd.setNameFilters( types );
 
 	QString dir;
 	if( k->m_filename != "" )

plugins/lb302/lb302.cpp

@@ -469,7 +469,11 @@ int lb302Synth::process(sampleFrame *outbuf, const int size)
 	float samp;
 
 	// Hold on to the current VCF, and use it throughout this period
+#if QT_VERSION >= 0x050000
+	lb302Filter *filter = vcf.loadAcquire();
+#else
 	lb302Filter *filter = vcf;
+#endif
 
 	if( release_frame == 0 || ! m_playingNote ) 
 	{