summaryrefslogtreecommitdiffstats
path: root/src/core/core_gyp_generator.pro
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2016-11-24 10:34:04 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-11-24 10:34:04 +0100
commitda4d5bd985454fe2dc5fbe44c92b81a94b525088 (patch)
tree34819bb7b5c9a3f721c567f3f664bfe4d6048f2e /src/core/core_gyp_generator.pro
parentb44962c8bce5489deee289212282cdf2c89b425a (diff)
parent95a22234a4671e6e79ce1cecbd720551a185d278 (diff)
Merge branch '5.6' into 5.7
Conflicts: src/core/api/qwebengineurlrequestinfo.cpp src/core/api/qwebengineurlrequestinfo.h src/core/core_gyp_generator.pro Change-Id: I5c78f0c86f6dcd61697148f0729d3d3a2cb2c76f
Diffstat (limited to 'src/core/core_gyp_generator.pro')
-rw-r--r--src/core/core_gyp_generator.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 7351b108c..d4e4d2388 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -46,6 +46,7 @@ SOURCES = \
clipboard_qt.cpp \
color_chooser_qt.cpp \
color_chooser_controller.cpp \
+ common/qt_ipc_logging.cpp \
common/qt_messages.cpp \
common/user_script_data.cpp \
content_client_qt.cpp \