1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
Author: Reiner Herrmann <reiner@reiner-h.de>
Description: Port to Qt5
Bug-Debian: https://bugs.debian.org/875195
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,9 +16,10 @@
### Qt 4 http://qt.nokia.com/
###
-FIND_PACKAGE(Qt4 4.5.0 REQUIRED)
-INCLUDE(${QT_USE_FILE})
-SET(LIBS ${QT_LIBRARIES})
+FIND_PACKAGE(Qt5 COMPONENTS Core Widgets REQUIRED)
+INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDES})
+ADD_DEFINITIONS(${Qt5Widgets_DEFINITIONS})
+SET(LIBS ${Qt5Widgets_LIBRARIES})
FIND_PACKAGE(JACK REQUIRED)
SET(LIBS ${LIBS} ${JACK_LIBRARIES})
@@ -62,8 +63,8 @@
Marquee.hpp
)
-QT4_WRAP_CPP(sp_moc ${sp_moc_hpp})
-QT4_ADD_RESOURCES(sp_qrc stretchplayer.qrc)
+QT5_WRAP_CPP(sp_moc ${sp_moc_hpp})
+QT5_ADD_RESOURCES(sp_qrc stretchplayer.qrc)
INCLUDE_DIRECTORIES(
${JACK_INCLUDE_DIRS}
@@ -104,7 +105,7 @@
ENDIF(${name}_FOUND)
ENDMACRO(lib_report)
-lib_report(QT4)
+lib_report(QT5)
lib_report(JACK)
lib_report(LibSndfile)
lib_report(RubberBand)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,7 +23,6 @@
#include "PlayerWidget.hpp"
#include <iostream>
-#include <QPlastiqueStyle>
#include <memory>
int main(int argc, char* argv[])
@@ -39,7 +38,7 @@
pw.reset(new StretchPlayer::PlayerWidget);
- app.setStyle( new QPlastiqueStyle );
+ app.setStyle("fusion");
pw->show();
--- a/src/JackAudioSystem.cpp
+++ b/src/JackAudioSystem.cpp
@@ -46,7 +46,7 @@
name = *app_name;
}
- _client = jack_client_open(name.toAscii(), JackNullOption, 0);
+ _client = jack_client_open(name.toLatin1(), JackNullOption, 0);
if(!_client) {
err = "Could not set up JACK";
goto init_bail;
|
