Fixes for travis.
--HG-- branch : develop
This commit is contained in:
parent
372df4661a
commit
230eb0fa54
|
@ -50,6 +50,7 @@ before_install:
|
||||||
brew install qt5;
|
brew install qt5;
|
||||||
else
|
else
|
||||||
unset SSL_CERT_FILE;
|
unset SSL_CERT_FILE;
|
||||||
|
brew upgrade > /dev/null;
|
||||||
brew install https://gist.githubusercontent.com/dismine/c3ac01de38e12edcf22d9e05791adf82/raw/064395d87d3bb352f8c4568d3e8f7b80b627f36a/qt5.rb;
|
brew install https://gist.githubusercontent.com/dismine/c3ac01de38e12edcf22d9e05791adf82/raw/064395d87d3bb352f8c4568d3e8f7b80b627f36a/qt5.rb;
|
||||||
fi
|
fi
|
||||||
chmod -R 755 /usr/local/opt/qt5/*
|
chmod -R 755 /usr/local/opt/qt5/*
|
||||||
|
@ -88,9 +89,6 @@ script:
|
||||||
else
|
else
|
||||||
make -j1;
|
make -j1;
|
||||||
fi
|
fi
|
||||||
after_failure:
|
|
||||||
- if [ -f /home/travis/build/dismine/Valentina_git/bw-outputs/build-wrapper-dump.json ]; then cat /home/travis/build/dismine/Valentina_git/bw-outputs/build-wrapper-dump.json; fi
|
|
||||||
- if [ -f /home/travis/build/dismine/Valentina_git/bw-outputs/build-wrapper.log ]; then cat /home/travis/build/dismine/Valentina_git/bw-outputs/build-wrapper.log; fi
|
|
||||||
notifications:
|
notifications:
|
||||||
email:
|
email:
|
||||||
recipients:
|
recipients:
|
||||||
|
|
|
@ -42,6 +42,7 @@
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QLineEdit>
|
#include <QLineEdit>
|
||||||
#include <QRegularExpression>
|
#include <QRegularExpression>
|
||||||
|
#include <QtGlobal>
|
||||||
|
|
||||||
const QColor errorColor = Qt::red;
|
const QColor errorColor = Qt::red;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user