Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit eb29ff8

Browse files
committed
remove debug stuff
1 parent 99f3d20 commit eb29ff8

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

.tcnt

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ env:
1212
- QT_VER=5.9.2
1313
- EXTRA_MODULES=.skycoder42.jsonserializer
1414
- STATIC_QT_MODS=qttools
15-
- STATIC_EXTRA_MODS=qtjsonserializer
1615

1716
matrix:
1817
include:
@@ -40,7 +39,7 @@ matrix:
4039
- PLATFORM=static
4140

4241
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
4443
- ./tests/ci/setup.sh
4544
- 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
4645

appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ environment:
88
QT_VER: 5.9.2
99
EXTRA_MODULES: .skycoder42.jsonserializer
1010
STATIC_QT_MODS: qttools
11-
STATIC_EXTRA_MODS: qtjsonserializer
1211

1312
matrix:
1413
- PLATFORM: msvc2017_64
@@ -40,7 +39,7 @@ matrix:
4039
image: Visual Studio 2015
4140

4241
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
4443
- npm install -g json-server
4544
- .\qtmodules-travis\ci\win\setup.bat
4645

tests/auto/restclient/tst_global.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void initTestJsonServer(QString relativeDbPath)
2525

2626
inFile.close();
2727
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
2929
}
3030

3131
QtRestClient::RestClient *createClient(QObject *parent)

tools/qrestbuilder/qrestbuilder.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
option(host_build)
22

3-
QT = core jsonserializer
3+
QT = core
44
CONFIG += console c++11
55

66
TARGET = qrestbuilder

0 commit comments

Comments
 (0)