From b77553fc036296f81a16d17dc4755e520565b904 Mon Sep 17 00:00:00 2001 From: silverqx Date: Fri, 11 Aug 2023 14:51:12 +0200 Subject: [PATCH] qmake used LIBS_PRIVATE for MySQL C connector --- conf.pri.example | 20 ++++++++++---------- qmake/features/tiny_find_packages.prf | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/conf.pri.example b/conf.pri.example index fac7fc880..7cf3e06fe 100644 --- a/conf.pri.example +++ b/conf.pri.example @@ -127,19 +127,19 @@ win32-g++|win32-clang-g++ { # PKGCONFIG *= libmariadb # } # else: \ -# LIBS += -lmariadb +# LIBS_PRIVATE += -lmariadb # } # # Static build # else: \ # if(CONFIG(static, dll|shared|static|staticlib) | \ # CONFIG(staticlib, dll|shared|static|staticlib)): \ -# LIBS += -lmariadb.dll +# LIBS_PRIVATE += -lmariadb.dll # Or add manually (use only one method, above or this manual method) # # For shared build -# LIBS += -lmariadb +# LIBS_PRIVATE += -lmariadb # # For static build -# LIBS += -lmariadb.dll +# LIBS_PRIVATE += -lmariadb.dll } } @@ -172,8 +172,8 @@ else:win32-msvc|win32-clang-msvc { # tiny_add_system_includepath(\ # $$quote(C:/Program Files/MySQL/MySQL Server 8.1/include/)) -# LIBS += $$quote(-LC:/Program Files/MySQL/MySQL Server 8.1/lib/) -# LIBS += -llibmysql +# LIBS_PRIVATE += $$quote(-LC:/Program Files/MySQL/MySQL Server 8.1/lib/) +# LIBS_PRIVATE += -llibmysql } } @@ -211,12 +211,12 @@ else:unix { # } # else: \ # # Pick only one -# LIBS += -lmysqlclient -## LIBS += -lmariadb +# LIBS_PRIVATE += -lmysqlclient +## LIBS_PRIVATE += -lmariadb # Or add manually (use only one method, above or this manual method) # Pick only one -# LIBS += -lmysqlclient -# LIBS += -lmariadb +# LIBS_PRIVATE += -lmysqlclient +# LIBS_PRIVATE += -lmariadb } } diff --git a/qmake/features/tiny_find_packages.prf b/qmake/features/tiny_find_packages.prf index feb3a286c..a556fc718 100644 --- a/qmake/features/tiny_find_packages.prf +++ b/qmake/features/tiny_find_packages.prf @@ -44,8 +44,8 @@ defineTest(tiny_find_mysql_mingw) { export(PKGCONFIG) } else { - LIBS += -lmariadb - export(LIBS) + LIBS_PRIVATE += -lmariadb + export(LIBS_PRIVATE) } } @@ -53,8 +53,8 @@ defineTest(tiny_find_mysql_mingw) { else: \ CONFIG(static, dll|shared|static|staticlib) | \ CONFIG(staticlib, dll|shared|static|staticlib) { - LIBS += -lmariadb.dll - export(LIBS) + LIBS_PRIVATE += -lmariadb.dll + export(LIBS_PRIVATE) } } @@ -77,13 +77,13 @@ defineTest(tiny_find_mysql_win32) { tiny_add_system_includepath($$TINY_MYSQL_INCLUDE) - LIBS += -L$$TINY_MYSQL_LIB - LIBS += -llibmysql + LIBS_PRIVATE += -L$$TINY_MYSQL_LIB + LIBS_PRIVATE += -llibmysql export(TINY_MYSQL_ROOT) export(TINY_MYSQL_INCLUDE) export(TINY_MYSQL_LIB) - export(LIBS) + export(LIBS_PRIVATE) } # Find the MySQL C library for UNIX platform. @@ -97,8 +97,8 @@ defineTest(tiny_find_mysql_unix) { export(PKGCONFIG) } else { - LIBS += -lmysqlclient - export(LIBS) + LIBS_PRIVATE += -lmysqlclient + export(LIBS_PRIVATE) } }