Merge branch 'Fix_branding' into 'master'
Improved handling of branding on mac if branding files are missing Closes #105 See merge request !294
| Status | Job ID | Name | Coverage | ||||||
|---|---|---|---|---|---|---|---|---|---|
| Test | |||||||||
| passed |
#32229
Linux
|
Doc-publish |
00:08:00
|
|
|||||
| passed |
#32228
Apple
|
Mac-Cpp11 |
00:38:33
|
|
|||||
| passed |
#32241
VS2013
Qt551
|
VS2013-Qt-5.5.1-x64 |
00:22:37
|
|
|||||
| passed |
#32224
Qt56
VS2015
|
VS2015-Qt-5.6.2-x32 |
00:25:22
|
|
|||||
| passed |
#32223
Qt56
VS2015
|
VS2015-Qt-5.6.2-x64 |
00:24:06
|
|
|||||
| passed |
#32226
VS2015
|
VS2015-Qt-5.9.0-x32 |
00:29:08
|
|
|||||
| passed |
#32225
VS2015
|
VS2015-Qt-5.9.0-x64 |
00:27:42
|
|
|||||
| passed |
#32220
MultiThreads
Linux
|
clang-c++11-Qt5 |
00:17:55
|
|
|||||
| passed |
#32221
MultiThreads
Linux
|
clang-c++11-Qt5.9.0 |
00:09:28
|
|
|||||
| passed |
#32222
MultiThreads
Linux
|
cppcheck |
00:04:44
|
|
|||||
| passed |
#32218
Linux
|
gcc-c++11-Qt5 |
00:04:43
|
|
|||||
| passed |
#32219
Linux
|
gcc-c++11-Qt5.9.0 |
00:04:55
|
|
|||||
| failed |
#32227
VS2013
Qt551
|
VS2013-Qt-5.5.1-x64 |
00:00:06
|
|
|||||