|
Link Here
|
| 1 |
The first hunk fixes the install location of the pkconfig files: |
1 |
The first hunk puts the catch-all { *; } first in version scripts |
|
|
2 |
so it has lowest priority when a symbol matches multiple patterns. |
| 3 |
|
| 4 |
The second hunk fixes the install location of the pkconfig files: |
| 2 |
FreeBSD installs pkgconfig files to $LOCALBASE/libdata/pkgconfig |
5 |
FreeBSD installs pkgconfig files to $LOCALBASE/libdata/pkgconfig |
| 3 |
qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR. |
6 |
qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR. |
| 4 |
As this is now '${PREFIX}/lib/qt5' we need to go up two levels. |
7 |
As this is now '${PREFIX}/lib/qt5' we need to go up two levels. |
| 5 |
|
8 |
|
| 6 |
The second hunk stops qmake from generating la files. |
9 |
The third hunk stops qmake from generating la files. |
| 7 |
|
10 |
|
| 8 |
--- mkspecs/features/qt_module.prf.orig 2016-09-16 05:49:42 UTC |
11 |
--- mkspecs/features/qt_module.prf.orig 2018-12-03 11:15:26 UTC |
| 9 |
+++ mkspecs/features/qt_module.prf |
12 |
+++ mkspecs/features/qt_module.prf |
| 10 |
@@ -247,7 +247,7 @@ load(qt_targets) |
13 |
@@ -217,17 +217,18 @@ android: CONFIG += qt_android_deps no_linker_version_s |
|
|
14 |
internal_module { |
| 15 |
verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };" |
| 16 |
} else { |
| 17 |
- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \ |
| 18 |
- " qt_private_api_tag*;" |
| 19 |
+ current = Qt_$$QT_MAJOR_VERSION |
| 20 |
+ verscript_content = "$$current { *; };" |
| 21 |
|
| 22 |
+ verscript_content += "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \ |
| 23 |
+ " qt_private_api_tag*;" |
| 24 |
+ |
| 25 |
private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES |
| 26 |
|
| 27 |
for(header, private_api_headers): \ |
| 28 |
verscript_content += " @FILE:$$header@" |
| 29 |
verscript_content += "};" |
| 30 |
|
| 31 |
- current = Qt_$$QT_MAJOR_VERSION |
| 32 |
- verscript_content += "$$current { *; };" |
| 33 |
isEmpty(QT_NAMESPACE): tag_symbol = qt_version_tag |
| 34 |
else: tag_symbol = qt_version_tag_$$QT_NAMESPACE |
| 35 |
|
| 36 |
@@ -266,7 +267,7 @@ load(qt_targets) |
| 11 |
# this builds on top of qt_common |
37 |
# this builds on top of qt_common |
| 12 |
!internal_module:!lib_bundle:if(unix|mingw) { |
38 |
!internal_module:if(unix|mingw) { |
| 13 |
CONFIG += create_pc |
39 |
CONFIG += create_pc |
| 14 |
- QMAKE_PKGCONFIG_DESTDIR = pkgconfig |
40 |
- QMAKE_PKGCONFIG_DESTDIR = pkgconfig |
| 15 |
+ QMAKE_PKGCONFIG_DESTDIR = ../../libdata/pkgconfig |
41 |
+ QMAKE_PKGCONFIG_DESTDIR = ../../libdata/pkgconfig |
| 16 |
host_build: \ |
42 |
host_build: \ |
| 17 |
QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS] |
43 |
QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS] |
| 18 |
else: \ |
44 |
else: \ |
| 19 |
@@ -267,7 +267,6 @@ load(qt_targets) |
45 |
@@ -291,7 +292,6 @@ load(qt_targets) |
| 20 |
QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace |
46 |
QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace |
| 21 |
} |
47 |
} |
| 22 |
!lib_bundle:unix { |
48 |
!lib_bundle:unix { |