QtCore: compile with QT_DISABLE_DEPRECATED_BEFORE=0x050d00
Don't call or implement functions which are not available when compiling with QT_DISABLE_DEPRECATED_BEFORE=0x050d00 Change-Id: I949b12bba880c516391f312f58c8748303a1790d Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
76efe79d5c
commit
615b02bfa2
@ -998,7 +998,12 @@ void QProcessPrivate::setErrorAndEmit(QProcess::ProcessError error, const QStrin
|
|||||||
Q_ASSERT(error != QProcess::UnknownError);
|
Q_ASSERT(error != QProcess::UnknownError);
|
||||||
setError(error, description);
|
setError(error, description);
|
||||||
emit q->errorOccurred(processError);
|
emit q->errorOccurred(processError);
|
||||||
|
#if QT_DEPRECATED_SINCE(5, 6)
|
||||||
|
QT_WARNING_PUSH
|
||||||
|
QT_WARNING_DISABLE_DEPRECATED
|
||||||
emit q->error(processError);
|
emit q->error(processError);
|
||||||
|
QT_WARNING_POP
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@ -1013,6 +1013,7 @@ void QCoreApplication::setQuitLockEnabled(bool enabled)
|
|||||||
quitLockRefEnabled = enabled;
|
quitLockRefEnabled = enabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if QT_DEPRECATED_SINCE(5, 6)
|
||||||
/*!
|
/*!
|
||||||
\internal
|
\internal
|
||||||
\deprecated
|
\deprecated
|
||||||
@ -1024,6 +1025,7 @@ bool QCoreApplication::notifyInternal(QObject *receiver, QEvent *event)
|
|||||||
{
|
{
|
||||||
return notifyInternal2(receiver, event);
|
return notifyInternal2(receiver, event);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\internal
|
\internal
|
||||||
|
@ -37,6 +37,9 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include "qglobal.h"
|
||||||
|
#if QT_DEPRECATED_SINCE(5, 10)
|
||||||
|
|
||||||
#include "qsignalmapper.h"
|
#include "qsignalmapper.h"
|
||||||
#include "qhash.h"
|
#include "qhash.h"
|
||||||
#include "qobject_p.h"
|
#include "qobject_p.h"
|
||||||
@ -312,3 +315,4 @@ QT_END_NAMESPACE
|
|||||||
|
|
||||||
#include "moc_qsignalmapper.cpp"
|
#include "moc_qsignalmapper.cpp"
|
||||||
|
|
||||||
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user