From b3f74bb12ab86a90a05f7d48325b25c408d0b985 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 28 Oct 2024 13:39:23 +0900 Subject: Drop Borland compiler specific code Signed-off-by: Michele Calgaro (cherry picked from commit 69e1261df646edf24612d7f953dac81182e7461b) --- plugins/src/imageformats/mng/mng.pro | 4 ---- plugins/src/sqldrivers/ibase/ibase.pro | 3 +-- plugins/src/sqldrivers/mysql/mysql.pro | 3 --- plugins/src/sqldrivers/odbc/odbc.pro | 3 +-- plugins/src/sqldrivers/psql/psql.pro | 3 --- plugins/src/sqldrivers/sqlite/sqlite.pro | 3 --- plugins/src/sqldrivers/sqlite3/sqlite3.pro | 3 --- 7 files changed, 2 insertions(+), 20 deletions(-) (limited to 'plugins/src') diff --git a/plugins/src/imageformats/mng/mng.pro b/plugins/src/imageformats/mng/mng.pro index 2c39f9412..ad3ee3612 100644 --- a/plugins/src/imageformats/mng/mng.pro +++ b/plugins/src/imageformats/mng/mng.pro @@ -9,10 +9,6 @@ REQUIRES = !no-mng !mng SOURCES += main.cpp -win32-borland { - QMAKE_CFLAGS_WARN_ON += -w-par - QMAKE_CXXFLAGS_WARN_ON += -w-par -} win32: CONFIG-=zlib system-zlib jpeg system-jpeg system-mng { diff --git a/plugins/src/sqldrivers/ibase/ibase.pro b/plugins/src/sqldrivers/ibase/ibase.pro index 942d8abc7..5fc4a2449 100644 --- a/plugins/src/sqldrivers/ibase/ibase.pro +++ b/plugins/src/sqldrivers/ibase/ibase.pro @@ -17,8 +17,7 @@ unix { } win32 { OBJECTS_DIR = obj - !win32-borland:LIBS *= gds32_ms.lib - win32-borland:LIBS += gds32.lib + LIBS *= gds32_ms.lib } REQUIRES = sql diff --git a/plugins/src/sqldrivers/mysql/mysql.pro b/plugins/src/sqldrivers/mysql/mysql.pro index 9100edaf5..28a17ad5b 100644 --- a/plugins/src/sqldrivers/mysql/mysql.pro +++ b/plugins/src/sqldrivers/mysql/mysql.pro @@ -22,9 +22,6 @@ win32 { # LIBS *= delayimp.lib # QMAKE_LFLAGS += /DELAYLOAD:libmysql.dll # } -# win32-borland: { -# QMAKE_LFLAGS += /dlibmysql.dll -# } } REQUIRES = sql diff --git a/plugins/src/sqldrivers/odbc/odbc.pro b/plugins/src/sqldrivers/odbc/odbc.pro index 36d35b51c..1a6556e39 100644 --- a/plugins/src/sqldrivers/odbc/odbc.pro +++ b/plugins/src/sqldrivers/odbc/odbc.pro @@ -23,8 +23,7 @@ unix { win32 { OBJECTS_DIR = obj - !win32-borland:LIBS *= -lodbc32 - win32-borland:LIBS *= $(BCB)/lib/PSDK/odbc32.lib + LIBS *= -lodbc32 } REQUIRES = sql diff --git a/plugins/src/sqldrivers/psql/psql.pro b/plugins/src/sqldrivers/psql/psql.pro index ad94ccd71..52049cc62 100644 --- a/plugins/src/sqldrivers/psql/psql.pro +++ b/plugins/src/sqldrivers/psql/psql.pro @@ -21,9 +21,6 @@ win32 { # LIBS *= delayimp.lib # QMAKE_LFLAGS += /DELAYLOAD:libpq.dll # } -# win32-borland: { -# QMAKE_LFLAGS += /dlibpq.dll -# } } REQUIRES = sql diff --git a/plugins/src/sqldrivers/sqlite/sqlite.pro b/plugins/src/sqldrivers/sqlite/sqlite.pro index 6234b0d31..9c50a577b 100644 --- a/plugins/src/sqldrivers/sqlite/sqlite.pro +++ b/plugins/src/sqldrivers/sqlite/sqlite.pro @@ -18,9 +18,6 @@ win32 { # LIBS *= delayimp.lib # QMAKE_LFLAGS += /DELAYLOAD:libsqlite.dll # } -# win32-borland: { -# QMAKE_LFLAGS += /dlibsqlite.dll -# } } !contains( LIBS, .*sqlite.* ) { diff --git a/plugins/src/sqldrivers/sqlite3/sqlite3.pro b/plugins/src/sqldrivers/sqlite3/sqlite3.pro index c3184f937..c05fa0966 100644 --- a/plugins/src/sqldrivers/sqlite3/sqlite3.pro +++ b/plugins/src/sqldrivers/sqlite3/sqlite3.pro @@ -22,9 +22,6 @@ win32 { # LIBS *= delayimp.lib # QMAKE_LFLAGS += /DELAYLOAD:sqlite3.dll # } -# win32-borland: { -# QMAKE_LFLAGS += /dsqlite3.dll -# } } REQUIRES = sql -- cgit v1.2.3