diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-04 07:29:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-05 11:35:18 +0200 |
| commit | 179463fd2b17343dae291ab6f7617311bcfbdb75 (patch) | |
| tree | e32e298ca5d6e2b6e206dab7d42538a6ce68eba1 /src/core/core_gyp_generator.pro | |
| parent | c8851dd1a77e730bc6a3c17b7c75b1a4c6b41f53 (diff) | |
| parent | 336e706cbc839dd7b7c1d461b6b015600b5f009e (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
and comboBoxPopupPositionAfterMove().
Conflicts:
.qmake.conf
src/3rdparty
src/core/render_widget_host_view_qt.cpp
src/core/resources/resources.gyp
src/webengine/doc/src/qtwebengine-platform-notes.qdoc
src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
tests/auto/widgets/qwebenginepage/BLACKLIST
tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
tools/qmake/mkspecs/features/functions.prf
Task-number: QTBUG-55158
Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4
Diffstat (limited to 'src/core/core_gyp_generator.pro')
| -rw-r--r-- | src/core/core_gyp_generator.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index 155d81f5d..70644e5f6 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -2,8 +2,9 @@ # We want the gyp generation step to happen after all the other config steps. For that we need to prepend # our gyp_generator.prf feature to the CONFIG variable since it is processed backwards CONFIG = gyp_generator $$CONFIG -GYPFILE = $$PWD/core_generated.gyp -GYPINCLUDES += qtwebengine.gypi +GYPFILE = $$OUT_PWD/core_generated.gyp +GYPINCLUDES += $$PWD/qtwebengine.gypi +GYPSRCDIR = $$PWD TEMPLATE = lib @@ -18,6 +19,7 @@ DEFINES += QT_NO_KEYWORDS \ # Ensure that response files, generated by qtbase/mkspecs/features/moc.prf, are found by moc. MOC_DIR = $$OUT_PWD/$$getConfigDir()/.moc +RCC_DIR = $$OUT_PWD/$$getConfigDir()/.rcc # Assume that we want mobile touch and low-end hardware behaviors # whenever we are cross compiling. |