From d62356c08e23c6971d2996866eb6bdf43000520b Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Thu, 15 Sep 2016 17:07:50 +0800 Subject: Fix FTBFS. Force Qt5 while building. --- ChangeLog | 3 +++ debian/control | 3 ++- debian/qmidiplayer-plugin-visualization.install | 3 ++- debian/rules | 2 +- img/kb_128.png | Bin qmidiplayer-desktop/qmidiplayer.desktop | 0 qmidiplayer-desktop/qmpinfowindow.cpp | 2 +- 7 files changed, 9 insertions(+), 4 deletions(-) mode change 100755 => 100644 img/kb_128.png mode change 100755 => 100644 qmidiplayer-desktop/qmidiplayer.desktop 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 old mode 100755 new mode 100644 diff --git a/qmidiplayer-desktop/qmidiplayer.desktop b/qmidiplayer-desktop/qmidiplayer.desktop old mode 100755 new mode 100644 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() -- cgit v1.2.3