summaryrefslogtreecommitdiffstats
path: root/src/webengine
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-11-18 14:23:25 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-28 16:16:28 +0100
commit1c5e30928bd3ec31747276ff60940ec144a2cc16 (patch)
tree7ccc07f0687bae9b2fd6b6eb494d8e3b8663690b /src/webengine
parentfd61d752e313bf91a09c85020b3fb50067c610c8 (diff)
Moving sources to src part 2: Adjust paths.
NOTE: To build after this you should rerun init-repository.py or run $> git submodule sync $> git submodule update $> git config qtwebengine.chromiumsrcdir src/3rdparty This makes everything build by adjusting paths. Other mixed-in changes: - Rename qtwebengine_src variables in scripts to qtwebengine_root to avoid confusion. - Cleanup the release and debug extra targets that were in lib.pro. This file has also been split into src.pro and core.pro. Change-Id: Ieee9158a65f526b15244eaca59e779b7069d337e Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src/webengine')
-rw-r--r--src/webengine/plugin/experimental/experimental.pro2
-rw-r--r--src/webengine/plugin/plugin.pro2
-rw-r--r--src/webengine/webengine.pro13
3 files changed, 8 insertions, 9 deletions
diff --git a/src/webengine/plugin/experimental/experimental.pro b/src/webengine/plugin/experimental/experimental.pro
index ad2e0b8a..fb396c34 100644
--- a/src/webengine/plugin/experimental/experimental.pro
+++ b/src/webengine/plugin/experimental/experimental.pro
@@ -8,7 +8,7 @@ QT_PRIVATE += webengine-private qml-private quick-private gui-private core-priva
qtHaveModule(v8): QT_PRIVATE += v8-private
-INCLUDEPATH += $$QTWEBENGINE_ROOT/lib $$QTWEBENGINE_ROOT/lib/quick
+INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core $$QTWEBENGINE_ROOT/src/webengine/api
SOURCES = plugin.cpp
diff --git a/src/webengine/plugin/plugin.pro b/src/webengine/plugin/plugin.pro
index 93e04f97..9dca82fe 100644
--- a/src/webengine/plugin/plugin.pro
+++ b/src/webengine/plugin/plugin.pro
@@ -6,7 +6,7 @@ IMPORT_VERSION = 1.0
QT += webengine qml quick
QT_PRIVATE += webengine-private qml-private quick-private gui-private core-private
-INCLUDEPATH += $$QTWEBENGINE_ROOT/lib $$QTWEBENGINE_ROOT/lib/quick
+INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core $$QTWEBENGINE_ROOT/src/webengine/api
SOURCES = plugin.cpp
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro
index 50353066..ccf87435 100644
--- a/src/webengine/webengine.pro
+++ b/src/webengine/webengine.pro
@@ -1,5 +1,4 @@
TARGET = QtWebEngine
-MODULE = webengine
# For our export macros
DEFINES += QT_BUILD_WEBENGINE_LIB
@@ -10,7 +9,7 @@ QT_PRIVATE += qml-private quick-private gui-private core-private
# Remove this as soon as we have a hard-dependency on Qt 5.2
qtHaveModule(v8): QT_PRIVATE += v8-private
-INCLUDEPATH += ../
+INCLUDEPATH += api ../core
# FIXME: all this should eventually be turned into QT += webenginecore
macx:LIBPATH = $$getOutDir()/$$getConfigDir()
@@ -21,14 +20,14 @@ QMAKE_RPATHDIR += $$LIBPATH
#DESTDIR = $$LIBPATH
SOURCES = \
- qquickwebengineview.cpp \
+ api/qquickwebengineview.cpp \
render_widget_host_view_qt_delegate_quick.cpp
HEADERS = \
- qtwebengineglobal.h \
- qtwebengineglobal_p.h \
- qquickwebengineview_p.h \
- qquickwebengineview_p_p.h \
+ api/qtwebengineglobal.h \
+ api/qtwebengineglobal_p.h \
+ api/qquickwebengineview_p.h \
+ api/qquickwebengineview_p_p.h \
render_widget_host_view_qt_delegate_quick.h
load(qt_module)