fba1acd3d7
fix windows test run unit test round 2 attempting to fix ccache use on darwin made ccache optional, no longer pulls clang on darwin build fixing darwin build from Dockerfile fixed missing nproc on OSX updated readme to include regtest example, build examples fix QT unit tests made -j get passed down, added build.sh
26 lines
749 B
Diff
26 lines
749 B
Diff
--- old/qtbase/src/gui/configure.pri 2018-06-06 17:28:10.000000000 -0400
|
|
+++ new/qtbase/src/gui/configure.pri 2018-08-17 18:43:01.589384567 -0400
|
|
@@ -43,18 +43,11 @@
|
|
}
|
|
|
|
defineTest(qtConfTest_xkbConfigRoot) {
|
|
- qtConfTest_getPkgConfigVariable($${1}): return(true)
|
|
-
|
|
- for (dir, $$list("/usr/share/X11/xkb", "/usr/local/share/X11/xkb")) {
|
|
- exists($$dir) {
|
|
- $${1}.value = $$dir
|
|
- export($${1}.value)
|
|
- $${1}.cache += value
|
|
- export($${1}.cache)
|
|
- return(true)
|
|
- }
|
|
- }
|
|
- return(false)
|
|
+ $${1}.value = "/usr/share/X11/xkb"
|
|
+ export($${1}.value)
|
|
+ $${1}.cache += value
|
|
+ export($${1}.cache)
|
|
+ return(true)
|
|
}
|
|
|
|
defineTest(qtConfTest_qpaDefaultPlatform) {
|