whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove mentions of borland from project files 

Change-Id: I3049b24ae287bee50aca1de06664a2309df69edf
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
bb10
Oswald Buddenhagen 2012-09-14 12:13:55 +02:00 committed by The Qt Project
parent 523c90810d
commit 33e0d5c939
11 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/drivers/db2/qsql_db2.pri
View File

@ -3,6 +3,6 @@ SOURCES += $$PWD/qsql_db2.cpp
unix {
!contains(LIBS, .*db2.*):LIBS += -ldb2
} else:!win32-borland {
} else {
!contains(LIBS, .*db2.*):LIBS += -ldb2cli
}

3
src/sql/drivers/ibase/qsql_ibase.pri
View File

@ -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
}
}

3
src/sql/drivers/odbc/qsql_odbc.pri
View File

@ -8,6 +8,5 @@ unix {
else:LIBS += $$QT_LFLAGS_ODBC
}
} else {
win32-borland:LIBS *= $(BCB)/lib/PSDK/odbc32.lib
else:LIBS *= -lodbc32
LIBS *= -lodbc32
}

2
src/sql/drivers/tds/qsql_tds.pri
View File

@ -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
}

2
src/winmain/winmain.pro
View File

@ -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

5
src/xml/xml.pro
View File

@ -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)

2
tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro
View File

@ -1,6 +1,6 @@
win32 {
SOURCES = main_win.cpp
!win32-borland:LIBS += -luser32
LIBS += -luser32
}
CONFIG -= qt app_bundle

2
tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
View File

@ -1,6 +1,6 @@
win32 {
SOURCES = main_win.cpp
!win32-borland:!wince*:LIBS += -luser32
!wince*:LIBS += -luser32
}
unix {
SOURCES = main_unix.cpp

1
tests/auto/corelib/plugin/qlibrary/lib/lib.pro
View File

@ -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

1
tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
View File

@ -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...

1
tests/auto/corelib/plugin/qpluginloader/lib/lib.pro
View File

@ -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