This repository was archived by the owner on Mar 4, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 5 files changed +4
-7
lines changed Expand file tree Collapse file tree 5 files changed +4
-7
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change 12
12
- QT_VER=5.9.2
13
13
- EXTRA_MODULES=.skycoder42.jsonserializer
14
14
- STATIC_QT_MODS=qttools
15
- - STATIC_EXTRA_MODS=qtjsonserializer
16
15
17
16
matrix :
18
17
include :
@@ -40,7 +39,7 @@ matrix:
40
39
- PLATFORM=static
41
40
42
41
before_install :
43
- - git clone https://github.com/Skycoder42/QtModules.git --branch static-tools ./qtmodules-travis
42
+ - git clone https://github.com/Skycoder42/QtModules.git ./qtmodules-travis
44
43
- ./tests/ci/setup.sh
45
44
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then travis_wait 40 ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh; else ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh; fi
46
45
Original file line number Diff line number Diff line change @@ -8,7 +8,6 @@ environment:
8
8
QT_VER : 5.9.2
9
9
EXTRA_MODULES : .skycoder42.jsonserializer
10
10
STATIC_QT_MODS : qttools
11
- STATIC_EXTRA_MODS : qtjsonserializer
12
11
13
12
matrix :
14
13
- PLATFORM : msvc2017_64
@@ -40,7 +39,7 @@ matrix:
40
39
image : Visual Studio 2015
41
40
42
41
install :
43
- - git clone https://github.com/Skycoder42/QtModules.git --branch static-tools .\qtmodules-travis
42
+ - git clone https://github.com/Skycoder42/QtModules.git .\qtmodules-travis
44
43
- npm install -g json-server
45
44
- .\qtmodules-travis\ci\win\setup.bat
46
45
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ void initTestJsonServer(QString relativeDbPath)
25
25
26
26
inFile.close ();
27
27
outFile.close ();
28
- QThread::sleep (5 );// Time for the server to reload the database
28
+ QThread::sleep (10 );// Time for the server to reload the database
29
29
}
30
30
31
31
QtRestClient::RestClient *createClient (QObject *parent)
Original file line number Diff line number Diff line change 1
1
option(host_build)
2
2
3
- QT = core jsonserializer
3
+ QT = core
4
4
CONFIG += console c++11
5
5
6
6
TARGET = qrestbuilder
You can’t perform that action at this time.
0 commit comments