diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
| commit | 158a3a4159bdc5a49caecd63e021dacbc06cf23c (patch) | |
| tree | c3ed9aee6cabd46e5e8615b3815b92d32857c4da /src/plugins/platforms/mirclient/mirclient.pro | |
| parent | 26ece94a68fb5ae680c5639716b06c4e1ae979a8 (diff) | |
| parent | 7b2fb038ae4b8b9231ae989ad309b6eca107a858 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qiodevice_p.h
src/corelib/kernel/qvariant_p.h
src/corelib/tools/qsimd.cpp
src/gui/kernel/qguiapplication.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a
Diffstat (limited to 'src/plugins/platforms/mirclient/mirclient.pro')
| -rw-r--r-- | src/plugins/platforms/mirclient/mirclient.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/mirclient/mirclient.pro b/src/plugins/platforms/mirclient/mirclient.pro index 033ce579b9..0851e8d719 100644 --- a/src/plugins/platforms/mirclient/mirclient.pro +++ b/src/plugins/platforms/mirclient/mirclient.pro @@ -21,6 +21,7 @@ PKGCONFIG += egl mirclient ubuntu-platform-api SOURCES = \ qmirclientbackingstore.cpp \ qmirclientclipboard.cpp \ + qmirclientcursor.cpp \ qmirclientglcontext.cpp \ qmirclientinput.cpp \ qmirclientintegration.cpp \ @@ -34,6 +35,7 @@ SOURCES = \ HEADERS = \ qmirclientbackingstore.h \ qmirclientclipboard.h \ + qmirclientcursor.h \ qmirclientglcontext.h \ qmirclientinput.h \ qmirclientintegration.h \ |