1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testlib: Remove Q_CC_BOR uses

Browse Source 
Borland's compiler is no longer supported.

Change-Id: I61e3fa2cfbb244b9ca4d1db734992abb96f64709
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Kari Oikarinen 2018-03-05 12:26:29 +02:00
parent 73be2aab75
commit fe7b63546d
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/testlib/qsignalspy.h
View File

@ -59,11 +59,7 @@ public:
explicit QSignalSpy(const QObject *obj, const char *aSignal) explicit QSignalSpy(const QObject *obj, const char *aSignal)
: m_waiting(false) : m_waiting(false)
{ {
#ifdef Q_CC_BOR
const int memberOffset = QObject::staticMetaObject.methodCount();
#else
static const int memberOffset = QObject::staticMetaObject.methodCount(); static const int memberOffset = QObject::staticMetaObject.methodCount();
#endif
if (!obj) { if (!obj) {
qWarning("QSignalSpy: Cannot spy on a null object"); qWarning("QSignalSpy: Cannot spy on a null object");
return; return;
@ -104,11 +100,7 @@ public:
QSignalSpy(const typename QtPrivate::FunctionPointer<Func>::Object *obj, Func signal0) QSignalSpy(const typename QtPrivate::FunctionPointer<Func>::Object *obj, Func signal0)
: m_waiting(false) : m_waiting(false)
{ {
#ifdef Q_CC_BOR
const int memberOffset = QObject::staticMetaObject.methodCount();
#else
static const int memberOffset = QObject::staticMetaObject.methodCount(); static const int memberOffset = QObject::staticMetaObject.methodCount();
#endif
if (!obj) { if (!obj) {
qWarning("QSignalSpy: Cannot spy on a null object"); qWarning("QSignalSpy: Cannot spy on a null object");
return; return;