aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <alee14498@protonmail.com>2020-01-21 21:57:54 -0500
committerAndrew Lee <alee14498@protonmail.com>2020-01-21 21:57:54 -0500
commite6c23c3629a633c3c7ef61eb1c97b4c4d12309a4 (patch)
tree659293233e94dc2b0bdfc4eb708294c9aad85266
parent07fb6e212e71a4d685d2d34fa4db6cdcbe61b450 (diff)
downloaderable-godot-e6c23c3629a633c3c7ef61eb1c97b4c4d12309a4.tar.gz
erable-godot-e6c23c3629a633c3c7ef61eb1c97b4c4d12309a4.tar.bz2
erable-godot-e6c23c3629a633c3c7ef61eb1c97b4c4d12309a4.zip
Added appveyor support
-rw-r--r--.travis.yml6
-rw-r--r--player.cpp2
-rw-r--r--player.ui8
3 files changed, 10 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index f47a297..aafbbd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,13 @@
language: cpp
+sudo: require
+dist: trusty
before_install:
- sudo apt-get install libtag1-dev qt5-qmake libqt5x11extras5-dev qt5-default qttools5-dev-tools libqt5svg5-dev qtmultimedia5-dev libgtk2.0-dev
script:
- qmake
- - make
- - make install INSTALL_ROOT=appdir
+ - make -j$(nproc)
+ - make install INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
- wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
- chmod a+x linuxdeployqt-continuous-x86_64.AppImage
- "./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -bundle-non-qt-libs"
diff --git a/player.cpp b/player.cpp
index 4db4811..b707aa7 100644
--- a/player.cpp
+++ b/player.cpp
@@ -32,6 +32,8 @@ Player::Player(QWidget *parent)
: QMainWindow(parent)
, ui(new Ui::Player)
{
+ QSlider volumeSlider;
+ //connect()
ui->setupUi(this);
}
diff --git a/player.ui b/player.ui
index 9f63c19..2128933 100644
--- a/player.ui
+++ b/player.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
- <height>600</height>
+ <height>607</height>
</rect>
</property>
<property name="windowTitle">
@@ -57,7 +57,7 @@
<rect>
<x>560</x>
<y>500</y>
- <width>160</width>
+ <width>211</width>
<height>31</height>
</rect>
</property>
@@ -93,9 +93,9 @@
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
- <x>570</x>
+ <x>650</x>
<y>530</y>
- <width>58</width>
+ <width>51</width>
<height>18</height>
</rect>
</property>