diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-01 23:08:05 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-01 23:08:05 +0100 |
| commit | dd5e1ffd3e9e379574325193c8546d453c11303e (patch) | |
| tree | d7aaaf3ad3098a0086ba15d768f0585fce1ab926 /src/client/client.pro | |
| parent | cf450400cad0461a0b4661d31fabd949d69ec772 (diff) | |
| parent | 4d3c3a08eba8d30805f18397c98e19ab9fd40722 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/client/qwaylanddisplay_p.h
Change-Id: I602b90a055d1322af369fb7b77a68583154b660f
Diffstat (limited to 'src/client/client.pro')
| -rw-r--r-- | src/client/client.pro | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index ca0e0a7d0..6802cd47b 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -16,7 +16,6 @@ load(qt_module) QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual CONFIG -= precompile_header -CONFIG -= create_cmake CONFIG += link_pkgconfig qpa/genericunixfontdatabase wayland-scanner !equals(QT_WAYLAND_GL_CONFIG, nogl) { @@ -78,7 +77,6 @@ SOURCES += qwaylandintegration.cpp \ qwaylandabstractdecoration.cpp \ qwaylanddecorationfactory.cpp \ qwaylanddecorationplugin.cpp \ - qwaylandeventthread.cpp\ qwaylandwindowmanagerintegration.cpp \ qwaylandinputcontext.cpp \ qwaylanddatadevice.cpp \ @@ -112,7 +110,6 @@ HEADERS += qwaylandintegration_p.h \ qwaylandabstractdecoration_p.h \ qwaylanddecorationfactory_p.h \ qwaylanddecorationplugin_p.h \ - qwaylandeventthread_p.h \ qwaylandwindowmanagerintegration_p.h \ qwaylandinputcontext_p.h \ qwaylanddatadevice_p.h \ |