From 33e0d5c9398491c70437e2a33df761a63ce6ddf1 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 14 Sep 2012 12:13:55 +0200
Subject: remove mentions of borland from project files

Change-Id: I3049b24ae287bee50aca1de06664a2309df69edf
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 src/sql/drivers/db2/qsql_db2.pri     | 2 +-
 src/sql/drivers/ibase/qsql_ibase.pri | 3 +--
 src/sql/drivers/odbc/qsql_odbc.pri   | 3 +--
 src/sql/drivers/tds/qsql_tds.pri     | 2 --
 src/winmain/winmain.pro              | 2 +-
 src/xml/xml.pro                      | 5 -----
 6 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/sql/drivers/db2/qsql_db2.pri b/src/sql/drivers/db2/qsql_db2.pri
index 16557f0e00..963732aaee 100644
--- 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 33fbb0de30..26017e8727 100644
--- 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 66a8d51af0..19ff784a04 100644
--- 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 521c06b799..3b5a6895c9 100644
--- 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 e5aa8c49e2..0fa4dca8d7 100644
--- 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 848107dee1..e6d5761227 100644
--- 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)
-- 
cgit v1.2.3