bea8c543d0
Update to 5.7.1 OBS-URL: https://build.opensuse.org/request/show/446432 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=58
40 lines
2.0 KiB
Diff
40 lines
2.0 KiB
Diff
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
|
index aefd3ae..53a3f60 100644
|
|
--- a/mkspecs/features/qt_module.prf
|
|
+++ b/mkspecs/features/qt_module.prf
|
|
@@ -195,16 +195,18 @@
|
|
|
|
!header_module:unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!no_linker_version_script:!static {
|
|
verscript = $${TARGET}.version
|
|
QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript
|
|
|
|
+ private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES
|
|
+
|
|
internal_module {
|
|
- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };"
|
|
+ verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API { *; };"
|
|
} else {
|
|
- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
|
|
+ verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API {" \
|
|
" qt_private_api_tag*;"
|
|
- for(header, SYNCQT.PRIVATE_HEADER_FILES): \
|
|
+ for(header, private_api_headers): \
|
|
verscript_content += " @FILE:$${_PRO_FILE_PWD_}/$$header@"
|
|
verscript_content += "};"
|
|
|
|
current = Qt_$$QT_MAJOR_VERSION
|
|
verscript_content += "$$current { *; };"
|
|
@@ -221,11 +223,11 @@
|
|
# Add a post-processing step to replace the @FILE:filename@
|
|
verscript_in = $${verscript}.in
|
|
verscriptprocess.name = linker version script ${QMAKE_FILE_BASE}
|
|
verscriptprocess.input = verscript_in
|
|
verscriptprocess.CONFIG += no_link target_predeps
|
|
- for(header, SYNCQT.PRIVATE_HEADER_FILES): \
|
|
+ for(header, private_api_headers): \
|
|
verscriptprocess.depends += $${_PRO_FILE_PWD_}/$$header
|
|
verscriptprocess.output = $$verscript
|
|
verscriptprocess.commands = perl $${PWD}/data/unix/findclasslist.pl < ${QMAKE_FILE_IN} > $@
|
|
silent:verscriptprocess.commands = @echo creating linker version script ${QMAKE_FILE_BASE} && $$verscriptprocess.commands
|
|
QMAKE_EXTRA_COMPILERS += verscriptprocess
|