remove mentions of borland from project files

Change-Id: I3049b24ae287bee50aca1de06664a2309df69edf
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/src/sql/drivers/db2/qsql_db2.pri b/src/sql/drivers/db2/qsql_db2.pri
index 16557f0..963732a 100644 (file)
--- a/src/sql/drivers/db2/qsql_db2.pri
+++ b/src/sql/drivers/db2/qsql_db2.pri
@@ -3,6 +3,6 @@ SOURCES += $$PWD/qsql_db2.cpp
 
 unix {
     !contains(LIBS, .*db2.*):LIBS += -ldb2
-} else:!win32-borland {
+} else {
     !contains(LIBS, .*db2.*):LIBS += -ldb2cli
 }

diff --git a/src/sql/drivers/ibase/qsql_ibase.pri b/src/sql/drivers/ibase/qsql_ibase.pri
index 33fbb0d..26017e8 100644 (file)
--- a/src/sql/drivers/ibase/qsql_ibase.pri
+++ b/src/sql/drivers/ibase/qsql_ibase.pri
@@ -5,7 +5,6 @@ unix {
     !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds
 } else {
     !contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) {
-        win32-borland:LIBS += gds32.lib
-        else:LIBS += -lgds32_ms
+        LIBS += -lgds32_ms
     }
 }

diff --git a/src/sql/drivers/odbc/qsql_odbc.pri b/src/sql/drivers/odbc/qsql_odbc.pri
index 66a8d51..19ff784 100644 (file)
--- a/src/sql/drivers/odbc/qsql_odbc.pri
+++ b/src/sql/drivers/odbc/qsql_odbc.pri
@@ -8,6 +8,5 @@ unix {
         else:LIBS += $$QT_LFLAGS_ODBC
     }
 } else {
-    win32-borland:LIBS *= $(BCB)/lib/PSDK/odbc32.lib
-    else:LIBS *= -lodbc32
+    LIBS *= -lodbc32
 }

diff --git a/src/sql/drivers/tds/qsql_tds.pri b/src/sql/drivers/tds/qsql_tds.pri
index 521c06b..3b5a689 100644 (file)
--- a/src/sql/drivers/tds/qsql_tds.pri
+++ b/src/sql/drivers/tds/qsql_tds.pri
@@ -5,8 +5,6 @@ unix|win32-g++*: {
     LIBS *= $$QT_LFLAGS_TDS
     !contains(LIBS, .*sybdb.*):LIBS += -lsybdb
     QMAKE_CXXFLAGS *= $$QT_CFLAGS_TDS
-} else:win32-borland {
-    LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB
 } else {
     LIBS *= -lNTWDBLIB
 }

diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
index e5aa8c4..0fa4dca 100644 (file)
--- a/src/winmain/winmain.pro
+++ b/src/winmain/winmain.pro
@@ -17,7 +17,7 @@ win32-msvc*:QMAKE_CFLAGS_DEBUG -= -Zi
 win32-msvc*:QMAKE_CXXFLAGS_DEBUG -= -Zi
 win32-msvc*:QMAKE_CFLAGS_DEBUG *= -Z7
 win32-msvc*:QMAKE_CXXFLAGS_DEBUG *= -Z7
-win32-g++*|win32-borland:DEFINES += QT_NEEDS_QMAIN
+win32-g++*: DEFINES += QT_NEEDS_QMAIN
 
 INCLUDEPATH += $$QT.core.includes
 

diff --git a/src/xml/xml.pro b/src/xml/xml.pro
index 848107d..e6d5761 100644 (file)
--- a/src/xml/xml.pro
+++ b/src/xml/xml.pro
@@ -14,10 +14,5 @@ QMAKE_DOCS_INDEX = ../../doc
 
 PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
 
-win32-borland {
-        QMAKE_CFLAGS_WARN_ON        += -w-use
-        QMAKE_CXXFLAGS_WARN_ON        += -w-use
-}
-
 include(dom/dom.pri)
 include(sax/sax.pri)

diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro b/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro
index e7109b9..935f436 100644 (file)
--- a/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro
@@ -1,6 +1,6 @@
 win32 {
    SOURCES = main_win.cpp
-   !win32-borland:LIBS += -luser32
+   LIBS += -luser32
 }
 
 CONFIG -= qt app_bundle

diff --git a/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro b/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
index 5a62614..c5fb286 100644 (file)
--- a/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
+++ b/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
@@ -1,6 +1,6 @@
 win32 {
    SOURCES = main_win.cpp
-   !win32-borland:!wince*:LIBS += -luser32
+   !wince*:LIBS += -luser32
 }
 unix {
    SOURCES = main_unix.cpp

diff --git a/tests/auto/corelib/plugin/qlibrary/lib/lib.pro b/tests/auto/corelib/plugin/qlibrary/lib/lib.pro
index 1f2561a..a92b4fa 100644 (file)
--- a/tests/auto/corelib/plugin/qlibrary/lib/lib.pro
+++ b/tests/auto/corelib/plugin/qlibrary/lib/lib.pro
@@ -8,7 +8,6 @@ QT = core
 
 wince*: DEFINES += WIN32_MSVC
 win32-msvc: DEFINES += WIN32_MSVC
-win32-borland: DEFINES += WIN32_BORLAND
 
 # This project is testdata for tst_qlibrary
 target.path = $$[QT_INSTALL_TESTS]/tst_qlibrary

diff --git a/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro b/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
index a45f694..dc6a660 100644 (file)
--- a/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
+++ b/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
@@ -9,7 +9,6 @@ QT = core
 
 wince*: DEFINES += WIN32_MSVC
 win32-msvc: DEFINES += WIN32_MSVC
-win32-borland: DEFINES += WIN32_BORLAND
 
 # Force a copy of the library to have an extension that is non-standard.
 # We want to test if we can load a shared library with *any* filename...

diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro b/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro
index 507706f..c74a00e 100644 (file)
--- a/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro
+++ b/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro
@@ -7,7 +7,6 @@ DESTDIR = ../bin
 QT = core
 
 win32-msvc: DEFINES += WIN32_MSVC
-win32-borland: DEFINES += WIN32_BORLAND
 
 # This is testdata for the tst_qpluginloader test.
 target.path = $$[QT_INSTALL_TESTS]/tst_qpluginloader/bin