diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 11:02:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 11:02:30 +0200 |
| commit | 901a00d5f165a3462e60a78c7a63e46da25067fd (patch) | |
| tree | bcf17e4b551d6140d1937f1ca3d90d82755968a1 /src/client/client.pro | |
| parent | 2a975049e582d98a4a3ee8dfce7a1be6737ec277 (diff) | |
| parent | f0e852e545789d4d52149ece368fa388c558a43f (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/compositor/wayland_wrapper/qwloutput.cpp
Change-Id: I05f7431aca46760f90632dfa7ef9c4d0abf392ec
Diffstat (limited to 'src/client/client.pro')
| -rw-r--r-- | src/client/client.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index 08c184a5e..29016c9c8 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -8,6 +8,8 @@ MODULE_PLUGIN_TYPES = \ wayland-inputdevice-integration \ wayland-decoration-client +CONFIG += generated_privates + load(qt_module) # We have a bunch of C code with casts, so we can't have this option |