qt5.qtwebengine: fail properly
QtWebEngine's build system is setup to perform certain platform checks (see mkspecs/features/platform.prf). But a failed check will not cause configuration phase to fail, but instead it configures no build targets. So in such case the build will successfully perform build and install phases. An empty output directories will are produced and the build succeeds. This patches qtwebengine qmake files to properly fail during configuration phase. This doesn't touch qt56 as it doesn't have this mechanism.
This commit is contained in:
parent
718a82b108
commit
3e3e3918f2
@ -62,8 +62,8 @@ let
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
qttools = [ ./qttools.patch ];
|
||||
qtwebengine =
|
||||
optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch
|
||||
qtwebengine = [ ./qtwebengine-no-build-skip.patch ]
|
||||
++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch
|
||||
++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch;
|
||||
qtwebkit = [ ./qtwebkit.patch ];
|
||||
};
|
||||
|
@ -0,0 +1,12 @@
|
||||
diff --git a/qtwebengine.pro b/qtwebengine.pro
|
||||
--- a/qtwebengine.pro
|
||||
+++ b/qtwebengine.pro
|
||||
@@ -5,7 +5,7 @@ runConfigure()
|
||||
|
||||
!isEmpty(skipBuildReason) {
|
||||
SUBDIRS =
|
||||
- log($${skipBuildReason}$${EOL})
|
||||
+ error($${skipBuildReason}$${EOL})
|
||||
log(QtWebEngine will not be built.$${EOL})
|
||||
}
|
||||
|
@ -60,6 +60,7 @@ let
|
||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
qtwebengine = [ ./qtwebengine-no-build-skip.patch ];
|
||||
qtwebkit = [ ./qtwebkit.patch ];
|
||||
};
|
||||
|
||||
|
@ -0,0 +1,12 @@
|
||||
diff --git a/qtwebengine.pro b/qtwebengine.pro
|
||||
--- a/qtwebengine.pro
|
||||
+++ b/qtwebengine.pro
|
||||
@@ -5,7 +5,7 @@ runConfigure()
|
||||
|
||||
!isEmpty(skipBuildReason) {
|
||||
SUBDIRS =
|
||||
- log($${skipBuildReason}$${EOL})
|
||||
+ error($${skipBuildReason}$${EOL})
|
||||
log(QtWebEngine will not be built.$${EOL})
|
||||
}
|
||||
|
@ -43,6 +43,7 @@ let
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
qttools = [ ./qttools.patch ];
|
||||
qtwebengine = [ ./qtwebengine-no-build-skip.patch ];
|
||||
qtwebkit = [ ./qtwebkit.patch ];
|
||||
qtvirtualkeyboard = [
|
||||
(fetchpatch {
|
||||
|
@ -0,0 +1,12 @@
|
||||
diff --git a/qtwebengine.pro b/qtwebengine.pro
|
||||
--- a/qtwebengine.pro
|
||||
+++ b/qtwebengine.pro
|
||||
@@ -5,7 +5,7 @@ runConfigure()
|
||||
|
||||
!isEmpty(skipBuildReason) {
|
||||
SUBDIRS =
|
||||
- log($${skipBuildReason}$${EOL})
|
||||
+ error($${skipBuildReason}$${EOL})
|
||||
log(QtWebEngine will not be built.$${EOL})
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user