diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-04 00:42:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-04 00:44:18 +0200 |
| commit | d8fc0da235b2bd566b2b6f1e21218afdf2f34eb3 (patch) | |
| tree | c0ca819521ed6901a83ab476fa822a886691d806 /src/plugins/platforms/minimal/qminimalintegration.h | |
| parent | 3649a6e61d823289d18be19387d7e3923dd90bd0 (diff) | |
| parent | cdf0c5905b3477c6cd01c519f883b7bb55447120 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/minimal/qminimalintegration.cpp
src/plugins/platforms/offscreen/qoffscreenintegration.cpp
Change-Id: Ica85deeab5c5038ac004718e25194b1157343480
Diffstat (limited to 'src/plugins/platforms/minimal/qminimalintegration.h')
| -rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h index ef39e32fa7..7dc01e1d51 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.h +++ b/src/plugins/platforms/minimal/qminimalintegration.h @@ -73,10 +73,7 @@ public: QPlatformWindow *createPlatformWindow(QWindow *window) const; QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; - QAbstractEventDispatcher *guiThreadEventDispatcher() const; - -private: - QAbstractEventDispatcher *m_eventDispatcher; + QAbstractEventDispatcher *createEventDispatcher() const; }; QT_END_NAMESPACE |