forked from pool/libqt5-qtbase
8d99fc9a15
- Update to 5.11.0 * New bugfix release * For more details please see: * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.11.0/?h=v5.11.0 - Remove patches, now upstream: * 0001-Do-a-static_cast-in-bit-blasts-that-are-UB.patch * 0001-sqlite-Check-that-there-are-values-to-be-set-when-bi.patch * 0002-sqlite-Bind-duplicated-named-placeholders-correctly.patch * 0003-sqlite-Prevent-a-crash-when-sqlite-does-not-detect-a.patch - Update to 5.11.0-rc * New bugfix release * No changelog available - Update to 5.11.0-beta4 * New bugfix release * No changelog available - Refresh patches: * force-cmake-private-headers.patch - Remove patches, now upstream: * 0001-Extend-the-MariaDB-define-check-to-cover-the-later-v.patch - Update to 5.11.0-beta3 * New bugfix release * No changelog available - Update to 5.11.0-beta2 * New bugfix release * No changelog available (forwarded request 611481 from Vogtinator) OBS-URL: https://build.opensuse.org/request/show/611696 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=81
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
From: Fabian Vogt <fabian@ritter-vogt.de>
|
|
Subject: Forcee inclusion of _PRIVATE_INCLUDE_DIRS to CMakeConfig files
|
|
References: QTBUG-37417
|
|
|
|
This is broken for shadow builds otherwise.
|
|
|
|
Index: qtbase-everywhere-src-5.11.0-beta4/mkspecs/features/create_cmake.prf
|
|
===================================================================
|
|
--- qtbase-everywhere-src-5.11.0-beta4.orig/mkspecs/features/create_cmake.prf
|
|
+++ qtbase-everywhere-src-5.11.0-beta4/mkspecs/features/create_cmake.prf
|
|
@@ -30,7 +30,6 @@ CMAKE_MODULE_NAME = $$cmakeModuleName($$
|
|
|
|
split_incpath {
|
|
CMAKE_ADD_SOURCE_INCLUDE_DIRS = true
|
|
- CMAKE_NO_PRIVATE_INCLUDES = true # Don't add private includes in the build dir which don't exist
|
|
CMAKE_SOURCE_INCLUDES = \
|
|
$$cmakeTargetPaths($$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME})
|
|
CMAKE_SOURCE_PRIVATE_INCLUDES = \
|
|
@@ -53,10 +52,6 @@ contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*"
|
|
CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
|
|
}
|
|
|
|
-isEmpty(QT.$${MODULE}_private.includes)| \
|
|
- !exists($$first(QT.$${MODULE}_private.includes)): \
|
|
- CMAKE_NO_PRIVATE_INCLUDES = true
|
|
-
|
|
CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
|
|
contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
|
|
CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
|