github-starred/qmlnet
2
0
Fork 0
mirror of https://github.com/qmlnet/qmlnet.git synced 2026-05-15 14:15:54 -06:00
Code Issues 56 Projects Packages Wiki Activity Actions

Updating Qt.

Browse source
This commit is contained in:
Paul Knopf 2020-08-01 22:52:37 -04:00
parent 3b1041eb1e
commit f890c16808
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -2,11 +2,11 @@ language: csharp
mono: none
matrix:
include:
- name: "Linux Qt 5.12.0"
- name: "Linux Qt 5.15.1"
dotnet: 3.1
os: linux
dist: xenial
- name: "OSX Qt 5.12.0"
- name: "OSX Qt 5.15.1"
dotnet: 3.1.300
os: osx
osx_image: xcode9.4

2
appveyor.yml
View file

@ -1,6 +1,6 @@
image: Visual Studio 2019
before_build:
- ps: Invoke-WebRequest -Uri https://github.com/qmlnet/qt-runtimes/releases/download/releases/qt-5.12.2-ad0689c-win-x64-dev.tar.gz -OutFile C:\qmlnet-qt.tar.gz
- ps: Invoke-WebRequest -Uri https://github.com/qmlnet/qt-runtimes/releases/download/releases/qt-5.15.1-7fc8b10-win-x64-dev.tar.gz -OutFile C:\qmlnet-qt.tar.gz
- cmd: 7z x C:\qmlnet-qt.tar.gz -oC:\
- cmd: 7z x C:\qmlnet-qt.tar -oC:\qmlnet-qt
- cmd: rm -r C:\Tools\GitVersion\

2
build/travis.linux.sh
View file

@ -8,7 +8,7 @@ QT_DIR=$SCRIPT_DIR/Qt
sudo apt-get install -y libgl1-mesa-dev
mkdir -p $QT_DIR
wget -O- -q https://github.com/qmlnet/qt-runtimes/releases/download/releases/qt-5.12.2-ad0689c-linux-x64-dev.tar.gz | tar xpz -C $QT_DIR
wget -O- -q https://github.com/qmlnet/qt-runtimes/releases/download/releases/qt-5.15.1-7fc8b10-linux-x64-dev.tar.gz | tar xpz -C $QT_DIR
export PATH=$QT_DIR/qt/bin:$PATH
export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/src/native/output:$QT_DIR/qt/lib

2
build/travis.osx.sh
View file

@ -5,7 +5,7 @@ SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
QT_DIR=$SCRIPT_DIR/Qt
mkdir -p $QT_DIR
wget -O- -q https://github.com/qmlnet/qt-runtimes/releases/download/releases/qt-5.12.2-ad0689c-osx-x64-dev.tar.gz | tar xpz -C $QT_DIR
wget -O- -q https://github.com/qmlnet/qt-runtimes/releases/download/releases/qt-5.15.1-7fc8b10-osx-x64-dev.tar.gz | tar xpz -C $QT_DIR
export PATH=$QT_DIR/qt/bin:$PATH
export DYLD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/src/native/output:$QT_DIR/qt/lib

2
src/net/Qml.Net.Tests/RuntimeManagerTests.cs
View file

@ -35,7 +35,7 @@ namespace Qml.Net.Tests
// Make sure the permissions are set correctly.
var permissions = UnixFileSystemInfo
.GetFileSystemEntry(Path.Combine(_tempDirectory, "qt", "lib", "libQt5Xml.so.5.12.2"))
.GetFileSystemEntry(Path.Combine(_tempDirectory, "qt", "lib", "libQt5Xml.so.5.15.0"))
.FileAccessPermissions;
permissions.Should().Be(FileAccessPermissions.UserReadWriteExecute
| FileAccessPermissions.GroupRead | FileAccessPermissions.GroupExecute

2
src/net/Qml.Net/QmlNetConfig.cs
View file

@ -4,7 +4,7 @@ namespace Qml.Net
{
public class QmlNetConfig
{
public static string QtBuildVersion => "qt-5.12.2-ad0689c";
public static string QtBuildVersion => "qt-5.15.1-7fc8b10";
public static bool ListenForExceptionsWhenInvokingTasks { get; set; }