aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2016-09-15 17:07:50 +0800
committerGravatar Chris Xiong <chirs241097@gmail.com> 2016-09-15 17:07:50 +0800
commitd62356c08e23c6971d2996866eb6bdf43000520b (patch)
tree23d30b8e6295df95463a79e81eab447895257ba2
parent5ad91b766172fe5ac38fcbe1a2268488d7da5686 (diff)
downloadQMidiPlayer-d62356c08e23c6971d2996866eb6bdf43000520b.tar.xz
Fix FTBFS. Force Qt5 while building.
-rw-r--r--ChangeLog3
-rw-r--r--debian/control3
-rw-r--r--debian/qmidiplayer-plugin-visualization.install3
-rwxr-xr-xdebian/rules2
-rw-r--r--[-rwxr-xr-x]img/kb_128.pngbin8727 -> 8727 bytes
-rw-r--r--[-rwxr-xr-x]qmidiplayer-desktop/qmidiplayer.desktop0
-rw-r--r--qmidiplayer-desktop/qmpinfowindow.cpp2
7 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4724c79..2870565 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-09-15 0.8.2 alpha
+Fix FTBFS. Force Qt5 while building.
+
2016-06-05 0.8.2 alpha
Make preset selection dialog non-modal.
diff --git a/debian/control b/debian/control
index 94d7d57..51e40c3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Priority: optional
Standards-Version: 3.9.2
Build-Depends: debhelper (>= 9),
qtbase5-dev,
+ qtdeclarative5-dev,
qt5-qmake,
libfluidsynth-dev,
qml-module-qtquick-controls,
@@ -26,4 +27,4 @@ Description: Midi player based on Qt and fluidsynth (Lite version).
Package: qmidiplayer-plugin-visualization
Architecture: any
Depends: qmidiplayer, ${shlibs:Depends}, ${misc:Depends}
-Description: Midi visualization plugin for QMidiPlayer. \ No newline at end of file
+Description: Midi visualization plugin for QMidiPlayer.
diff --git a/debian/qmidiplayer-plugin-visualization.install b/debian/qmidiplayer-plugin-visualization.install
index b27fef9..2c02e3e 100644
--- a/debian/qmidiplayer-plugin-visualization.install
+++ b/debian/qmidiplayer-plugin-visualization.install
@@ -1,3 +1,4 @@
usr/lib/qmidiplayer/*
usr/share/qmidiplayer/img/chequerboard.png
-usr/share/qmidiplayer/img/particle.png \ No newline at end of file
+usr/share/qmidiplayer/img/kb_128.png
+usr/share/qmidiplayer/img/particle.png
diff --git a/debian/rules b/debian/rules
index b606ceb..f4fb898 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
%:
- dh $@ --parallel
+ env QT_SELECT=qt5 dh $@ --parallel
override_dh_auto_install:
$(MAKE) INSTALL_ROOT=$$(pwd)/debian/tmp prefix=/usr install
diff --git a/img/kb_128.png b/img/kb_128.png
index 2d1bcc8..2d1bcc8 100755..100644
--- a/img/kb_128.png
+++ b/img/kb_128.png
Binary files differ
diff --git a/qmidiplayer-desktop/qmidiplayer.desktop b/qmidiplayer-desktop/qmidiplayer.desktop
index 2884d18..2884d18 100755..100644
--- a/qmidiplayer-desktop/qmidiplayer.desktop
+++ b/qmidiplayer-desktop/qmidiplayer.desktop
diff --git a/qmidiplayer-desktop/qmpinfowindow.cpp b/qmidiplayer-desktop/qmpinfowindow.cpp
index a4afd50..fda94f8 100644
--- a/qmidiplayer-desktop/qmpinfowindow.cpp
+++ b/qmidiplayer-desktop/qmpinfowindow.cpp
@@ -14,7 +14,7 @@ qmpInfoWindow::qmpInfoWindow(QWidget *parent) :
{
ui->setupUi(this);
int w=size().width(),h=size().height();w=w*(logicalDpiX()/96.);h=h*(logicalDpiY()/96.);
- setMaximumWidth(w);setMaximumHeight(h);setMinimumWidth(w);setMinimumHeight(h);
+ setMinimumWidth(w);setMinimumHeight(h);
}
qmpInfoWindow::~qmpInfoWindow()