diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2013-10-10 17:53:19 +0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 14:54:53 +0200 |
| commit | 00422cd2b723a9704ea3b705dd4fda5fa70723a6 (patch) | |
| tree | aa155c82bc100a74ebc530e70afaac8f92793db7 /src/serialport/qt4support/include | |
| parent | 58a82feaff4fc10082a365a77ca0e286bbd138c2 (diff) | |
Revert the incompatible qwineventnotifier.h for Qt4
The change
* 50ab4d4a8ff5f882b9699cbde26ad9d8824a4824
sync'd up the header file in question with the updates, but those
changes are incompatible with Qt4. This unfortunately means, a mix
has to be applied from both version.
Tested on Windows with Qt4 (MinGW).
Change-Id: I0468c03ccfb276096cfc3adf80bfc0b3488c81f2
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Diffstat (limited to 'src/serialport/qt4support/include')
| -rw-r--r-- | src/serialport/qt4support/include/QtCore/qwineventnotifier.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/serialport/qt4support/include/QtCore/qwineventnotifier.h b/src/serialport/qt4support/include/QtCore/qwineventnotifier.h index ed31e835..1e0b7294 100644 --- a/src/serialport/qt4support/include/QtCore/qwineventnotifier.h +++ b/src/serialport/qt4support/include/QtCore/qwineventnotifier.h @@ -49,11 +49,10 @@ QT_BEGIN_NAMESPACE -class QWinEventNotifierPrivate; class Q_CORE_EXPORT QWinEventNotifier : public QObject { Q_OBJECT - Q_DECLARE_PRIVATE(QWinEventNotifier) + Q_DECLARE_PRIVATE(QObject) public: explicit QWinEventNotifier(QObject *parent = 0); @@ -73,6 +72,12 @@ Q_SIGNALS: protected: bool event(QEvent * e); + +private: + Q_DISABLE_COPY(QWinEventNotifier) + + HANDLE handleToEvent; + bool enabled; }; QT_END_NAMESPACE |