-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2108 from LMMS/travis-qt5
Travis QT5
- Loading branch information
Showing
19 changed files
with
77 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,6 @@ | ||
sudo add-apt-repository ppa:kalakris/cmake -y; | ||
if [ $QT5 ] | ||
then | ||
sudo add-apt-repository ppa:ubuntu-sdk-team/ppa -y | ||
fi | ||
sudo apt-get update -qq |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,13 @@ | ||
sudo apt-get install -y cmake libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev \ | ||
libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev \ | ||
libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib \ | ||
libfltk1.3-dev libgig-dev | ||
PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev | ||
libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev | ||
libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev | ||
libgig-dev" | ||
|
||
if [ $QT5 ] | ||
then | ||
PACKAGES="$PACKAGES qtbase5-dev" | ||
else | ||
PACKAGES="$PACKAGES libqt4-dev" | ||
fi | ||
|
||
sudo apt-get install -y $PACKAGES |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_WERROR=ON .. | ||
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_WERROR=ON -DWANT_QT5=$QT5 .. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
/// \file AtomicInt.h | ||
/// \brief Compatibility subclass of QAtomicInt for supporting both Qt4 and Qt5 | ||
|
||
#ifndef LMMS_ATOMIC_H | ||
#define LMMS_ATOMIC_H | ||
|
||
#include <QtCore/QAtomicInt> | ||
|
||
#if QT_VERSION >= 0x050000 && QT_VERSION <= 0x050300 | ||
|
||
class AtomicInt : public QAtomicInt | ||
{ | ||
public: | ||
AtomicInt(int value=0) : QAtomicInt(value) {}; | ||
|
||
operator int() const {return loadAcquire();} | ||
}; | ||
|
||
#else | ||
|
||
typedef QAtomicInt AtomicInt; | ||
|
||
#endif // QT_VERSION >= 0x050000 && QT_VERSION <= 0x050300 | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,6 +28,7 @@ | |
#include "base64.h" | ||
|
||
#include <QBuffer> | ||
#include <QDataStream> | ||
#include <QVariant> | ||
|
||
namespace base64 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters