path: root/.qmake.conf
diff options
authorPierre Rossi <>2013-07-10 16:27:48 +0200
committerPierre Rossi <>2013-07-31 13:39:50 +0200
commit67d042d04f2b6cbe98f4eba2a50ed0d374165cae (patch)
treeff24cf732fa98750400a29354219ffbd70c84e1c /.qmake.conf
parent519367a98334b658a93ed1ba096dba92858445c7 (diff)
Split out the Widgets and QtQuick integration
This is the first step to making proper Qt Modules out of QtWebEngine. The Widgets integration becomes a proper C++ Qt Module while we make the QtQuick side a QML plugin for now (could probably be promoted if the need arises). Code-wise, this means the introduction of a WebContentsAdapterClient interface that is subclassed by the private implementation of our API classes for delegation of things that are UI specific. Functionality from WebContents and the like is exposed via the WebContentsAdapter. Change-Id: I4ca3395b9fe8502a24e36002cfd5af44067bb6e8 Reviewed-by: Jocelyn Turcotte <>
Diffstat (limited to '.qmake.conf')
1 files changed, 2 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 716685d2a..a094e83ca 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,6 +1,5 @@
-# The qmake generated module files belong into our build/qmake dir
-MODULE_QMAKE_OUTDIR = $$shadowed($$PWD/build/qmake)
+QMAKEPATH += $$PWD/build/qmake
+# All modules share the same version number. We plan on following Qt's releases for now.