summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/ntqglobal.h28
-rw-r--r--src/tools/ntqwinexport.h2
-rw-r--r--src/tools/qcom_p.h10
-rw-r--r--src/tools/qcomlibrary.cpp8
-rw-r--r--src/tools/qgarray.cpp5
-rw-r--r--src/tools/qgvector.cpp4
-rw-r--r--src/tools/qlocale.cpp4
-rw-r--r--src/tools/qt_tools.pri2
8 files changed, 2 insertions, 61 deletions
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index f83da9d79..ef71a722b 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -199,7 +199,6 @@
MPW - MPW C++
MWERKS - Metrowerks CodeWarrior
MSVC - Microsoft Visual C/C++, Intel C++ for Windows
- BOR - Borland/Turbo C++
WAT - Watcom C++
GNU - GNU C++
COMEAU - Comeau C++
@@ -266,14 +265,6 @@
# define Q_NO_USING_KEYWORD /* ### check "using" status */
# endif
-#elif defined(__BORLANDC__) || defined(__TURBOC__)
-# define Q_CC_BOR
-# if __BORLANDC__ < 0x502
-# define Q_NO_BOOL_TYPE
-# define Q_NO_EXPLICIT_KEYWORD
-# endif
-# define Q_NO_USING_KEYWORD /* ### check "using" status */
-
#elif defined(__WATCOMC__)
# define Q_CC_WAT
# if defined(Q_OS_QNX4)
@@ -852,17 +843,6 @@ class TQString;
# endif
# undef TQ_DISABLE_COPY /* avoid unresolved externals */
# endif
-#elif defined(Q_OS_LINUX) && defined(Q_CC_BOR)
-# if defined(QT_SHARED) /* create a TQt shared library */
-# define TQ_EXPORT __declspec(dllexport)
-# define Q_TEMPLATEDLL
-# define Q_TEMPLATE_EXTERN
-# undef TQ_DISABLE_COPY /* avoid unresolved externals */
-# else
-# define Q_TEMPLATEDLL
-# define Q_TEMPLATE_EXTERN
-# undef TQ_DISABLE_COPY /* avoid unresolved externals */
-# endif
#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
# define TQ_EXPORT __attribute__((visibility("default")))
# undef QT_MAKEDLL /* ignore these for other platforms */
@@ -1083,14 +1063,6 @@ TQ_EXPORT const char *tqInstallPathShare();
# pragma warning(disable: 4355) // 'this' : used in base member initializer list
# pragma warning(disable: 4231) // nonstandard extension used : 'extern' before template explicit instantiation
# pragma warning(disable: 4710) // function not inlined
-# elif defined(Q_CC_BOR)
-# pragma option -w-inl
-# pragma option -w-aus
-# pragma warn -inl
-# pragma warn -pia
-# pragma warn -ccc
-# pragma warn -rch
-# pragma warn -sig
# endif
#endif
diff --git a/src/tools/ntqwinexport.h b/src/tools/ntqwinexport.h
index dc5928391..3a8373c79 100644
--- a/src/tools/ntqwinexport.h
+++ b/src/tools/ntqwinexport.h
@@ -36,7 +36,7 @@
**
**********************************************************************/
-#if defined(Q_TEMPLATEDLL) && ( !defined(Q_CC_BOR) || !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) )
+#if defined(Q_TEMPLATEDLL) && ( !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) )
// MOC_SKIP_BEGIN
#if defined(Q_DEFINED_QASCIIDICT) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(TQ_EXPORTED_QASCIIDICT_TEMPLATES)
diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
index 9590468ae..3c2ced4cc 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/qcom_p.h
@@ -312,22 +312,12 @@ public: \
#endif // Q_CREATE_INSTANCE
# ifdef TQ_WS_WIN
-# ifdef Q_CC_BOR
-# define TQ_EXPORT_COMPONENT() \
- Q_UCM_VERIFICATION_DATA \
- TQ_EXTERN_C __declspec(dllexport) \
- const char * __stdcall qt_ucm_query_verification_data() \
- { return qt_ucm_verification_data; } \
- TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* \
- __stdcall ucm_instantiate()
-# else
# define TQ_EXPORT_COMPONENT() \
Q_UCM_VERIFICATION_DATA \
TQ_EXTERN_C __declspec(dllexport) \
const char *qt_ucm_query_verification_data() \
{ return qt_ucm_verification_data; } \
TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* ucm_instantiate()
-# endif
# else
# define TQ_EXPORT_COMPONENT() \
Q_UCM_VERIFICATION_DATA \
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index 20366db9a..77671e3ca 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -439,11 +439,7 @@ void TQComLibrary::createInstanceInternal()
return;
}
-# ifdef Q_CC_BOR
- typedef const char * __stdcall (*UCMQueryVerificationDataProc)();
-# else
typedef const char * (*UCMQueryVerificationDataProc)();
-# endif
UCMQueryVerificationDataProc ucmQueryVerificationdataProc;
ucmQueryVerificationdataProc =
(UCMQueryVerificationDataProc) resolve( "qt_ucm_query_verification_data" );
@@ -490,11 +486,7 @@ void TQComLibrary::createInstanceInternal()
return;
}
-#ifdef Q_CC_BOR
- typedef TQUnknownInterface* __stdcall (*UCMInstanceProc)();
-#else
typedef TQUnknownInterface* (*UCMInstanceProc)();
-#endif
UCMInstanceProc ucmInstanceProc;
ucmInstanceProc = (UCMInstanceProc) resolve( "ucm_instantiate" );
#if defined(QT_DEBUG_COMPONENT)
diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp
index ff1f7b08b..dbcaceccb 100644
--- a/src/tools/qgarray.cpp
+++ b/src/tools/qgarray.cpp
@@ -39,10 +39,7 @@
**********************************************************************/
#include "ntqglobal.h"
-#if defined(Q_CC_BOR)
- // needed for qsort() because of a std namespace problem on Borland
-# include "qplatformdefs.h"
-#elif defined(TQ_WS_WIN)
+#if defined(TQ_WS_WIN)
// needed for bsearch on some platforms
# include "qt_windows.h"
#endif
diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp
index ea1e2018a..448183c14 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/qgvector.cpp
@@ -39,10 +39,6 @@
**********************************************************************/
#include "ntqglobal.h"
-#if defined(Q_CC_BOR)
-// needed for qsort() because of a std namespace problem on Borland
-#include "qplatformdefs.h"
-#endif
#define TQGVECTOR_CPP
#include "ntqgvector.h"
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index 0714dbb88..af45c13e0 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -5684,7 +5684,6 @@ static char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, cha
// Some values of the floating-point control word can cause _qdtoa to crash with an underflow.
// We set a safe value here.
#ifdef Q_OS_WIN
-#ifndef Q_CC_BOR
unsigned int oldbits = _control87(0, 0);
#ifndef _M_X64 //x64 does not support precition control
_control87(0x9001F, 0xFFFFF);
@@ -5692,7 +5691,6 @@ static char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, cha
_control87(0x9001F, _MCW_DN|_MCW_EM|_MCW_RC);
#endif //_M_X64
#endif
-#endif
#ifdef Q_OS_LINUX
fenv_t envp;
@@ -5702,7 +5700,6 @@ static char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, cha
char *s = _qdtoa(d, mode, ndigits, decpt, sign, rve, resultp);
#ifdef Q_OS_WIN
-#ifndef Q_CC_BOR
_clear87();
#ifndef _M_X64
_control87(oldbits, 0xFFFFF);
@@ -5710,7 +5707,6 @@ static char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, cha
_control87(oldbits, _MCW_DN|_MCW_EM|_MCW_RC);
#endif //_M_X64
#endif
-#endif
#ifdef Q_OS_LINUX
fesetenv(&envp);
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index 175cc88e4..c988be7b0 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -79,8 +79,6 @@ tools {
$$TOOLS_CPP/qthreadstorage_win.cpp \
$$TOOLS_CPP/qcriticalsection_p.cpp
- win32-borland:SOURCES += $$TOOLS_CPP/qwinexport.cpp
-
wince-* {
SOURCES -= $$TOOLS_CPP/qdir_win.cpp \
$$TOOLS_CPP/qfile_win.cpp \
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-19 19:17:46 +0000