diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-02-13 14:43:40 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 02:35:10 +0100 |
| commit | 0554d1391028e6deffd7b52fa95650bc1f95d295 (patch) | |
| tree | 244096235d2f19285c740a1615d1ba92eddab473 /src/network/ssl | |
| parent | 016633931f708f6495874a8722c7aae657e37438 (diff) | |
Remove needless line "#define d d_ptr"
There was a time when qsslsocket.h declared its private slots as
Q_PRIVATE_SLOT(d, void _q_connectedSlot())
But now they are correctly declared as
Q_PRIVATE_SLOT(d_func(), void _q_connectedSlot())
so the "#define d d_ptr" hack isn't needed.
Specifically, the define would break moc-generated code that refers
to the member d of a structure (which a future moc revision does,
namely QByteArrayData::d).
Change-Id: Ic94fa4d523fb17e8088973cfc0d090d5cce97267
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index ffc9f3f9fe..311ac5fe86 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -2345,6 +2345,4 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories() QT_END_NAMESPACE -// For private slots -#define d d_ptr #include "moc_qsslsocket.cpp" |