summaryrefslogtreecommitdiffstats
path: root/src
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
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')
-rw-r--r--src/core/core.pro22
-rw-r--r--src/core/core_gyp_generator.pro9
-rw-r--r--src/core/core_resources.qrc2
-rw-r--r--src/core/devtools.qrc4
-rw-r--r--src/core/gyp_configure_host.pro2
-rw-r--r--src/core/gyp_configure_target.pro4
-rw-r--r--src/core/gyp_run.pro2
-rw-r--r--src/core/render_widget_host_view_qt.cpp1
-rw-r--r--src/core/resources/resources.pro4
-rw-r--r--src/process/process.pro2
-rw-r--r--src/src.pro76
-rw-r--r--src/webengine/plugin/experimental/experimental.pro2
-rw-r--r--src/webengine/plugin/plugin.pro2
-rw-r--r--src/webengine/webengine.pro13
-rw-r--r--src/webenginewidgets/webenginewidgets.pro18
15 files changed, 70 insertions, 93 deletions
diff --git a/src/core/core.pro b/src/core/core.pro
new file mode 100644
index 000000000..b6a856545
--- /dev/null
+++ b/src/core/core.pro
@@ -0,0 +1,22 @@
+TEMPLATE = subdirs
+
+# core_gyp_generator.pro is a dummy .pro file that is used by qmake
+# to generate our main .gyp file
+core_gyp_generator.file = core_gyp_generator.pro
+
+# gyp_configure_host.pro and gyp_configure_target.pro are phony pro files that
+# extract things like compiler and linker from qmake
+gyp_configure_host.file = gyp_configure_host.pro
+gyp_configure_target.file = gyp_configure_target.pro
+gyp_configure_target.depends = gyp_configure_host
+
+# gyp_run.pro calls gyp through gyp_qtwebengine on the qmake step, and ninja on the make step.
+gyp_run.file = gyp_run.pro
+
+gyp_run.depends = resources core_gyp_generator gyp_configure_host gyp_configure_target
+
+SUBDIRS += core_gyp_generator \
+ gyp_configure_host \
+ gyp_configure_target \
+ gyp_run \
+ resources \
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 76924ecd4..a4128fc72 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.gyp
GYPDEPENDENCIES += <(chromium_src_dir)/content/browser/devtools/devtools_resources.gyp:devtools_resources
-GYPINCLUDES += ../qtwebengine.gypi
+GYPINCLUDES += qtwebengine.gypi
TEMPLATE = lib
@@ -19,7 +20,7 @@ QT_PRIVATE += qml-private quick-private gui-private core-private
qtHaveModule(v8): QT_PRIVATE += v8-private
COPY_FILES = <(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak
-COPY_DESTINATIONS = ../resources/
+COPY_DESTINATIONS = resources/
# Defining keywords such as 'signal' clashes with the chromium code base.
DEFINES += QT_NO_KEYWORDS \
@@ -31,9 +32,9 @@ PER_CONFIG_DEFINES = QTWEBENGINEPROCESS_PATH=\\\"$$getOutDir()/%config/$$QTWEBEN
# Keep Skia happy
CONFIG(release, debug|release): DEFINES += NDEBUG
-RESOURCES += lib_resources.qrc devtools.qrc
+RESOURCES += core_resources.qrc devtools.qrc
# We need this to find the include files generated for the .pak resource files.
-INCLUDEPATH += $$absolute_path(../resources, $$PWD)
+INCLUDEPATH += $$absolute_path(resources, $$PWD)
# something fishy with qmake in 5.2 ?
INCLUDEPATH += $$[QT_INSTALL_HEADERS]
diff --git a/src/core/core_resources.qrc b/src/core/core_resources.qrc
index af8448d2b..9dbdf90af 100644
--- a/src/core/core_resources.qrc
+++ b/src/core/core_resources.qrc
@@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="data">
- <file alias="resources.pak">../resources/net_resources.pak</file>
+ <file alias="resources.pak">resources/net_resources.pak</file>
</qresource>
</RCC>
diff --git a/src/core/devtools.qrc b/src/core/devtools.qrc
index 225f88f65..96d24761d 100644
--- a/src/core/devtools.qrc
+++ b/src/core/devtools.qrc
@@ -1,6 +1,6 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="data">
- <file alias="devtools.pak">../resources/devtools_resources.pak</file>
- <file alias="discovery_page.html">../resources/devtools_discovery_page.html</file>
+ <file alias="devtools.pak">resources/devtools_resources.pak</file>
+ <file alias="discovery_page.html">resources/devtools_discovery_page.html</file>
</qresource>
</RCC>
diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro
index e99d1e7c5..3eb67389f 100644
--- a/src/core/gyp_configure_host.pro
+++ b/src/core/gyp_configure_host.pro
@@ -10,7 +10,7 @@ GYPI_CONTENTS = "{" \
" ['CXX.host', '$$which($$QMAKE_CXX)']," \
" ['LD.host', '$$which($$QMAKE_LINK)'],"
-GYPI_FILE = $$absolute_path('build/qmake_extras.gypi', $$QTWEBENGINE_ROOT)
+GYPI_FILE = $$absolute_path('qmake_extras.gypi')
!build_pass {
write_file($$GYPI_FILE, GYPI_CONTENTS)
}
diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro
index 6d9f414c3..4d5204407 100644
--- a/src/core/gyp_configure_target.pro
+++ b/src/core/gyp_configure_target.pro
@@ -26,9 +26,9 @@ GYPI_CONTENTS += " ]," \
GYPI_CONTENTS += "}"
-GYPI_FILE = $$absolute_path('build/qmake_extras.gypi', $$QTWEBENGINE_ROOT)
+GYPI_FILE = $$absolute_path('qmake_extras.gypi')
-!exists($$GYPI_FILE): error("-- $$GYPI not found --")
+!exists($$GYPI_FILE): error("-- $$GYPI_FILE not found --")
# Append to the file already containing the host settings.
!build_pass {
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index e0c8b4af1..1ee0b1bce 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -46,7 +46,7 @@ cross_compile {
!build_pass {
message(Running gyp_qtwebengine $${GYP_ARGS}...)
- !system("python ./gyp_qtwebengine $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --")
+ !system("python $$QTWEBENGINE_ROOT/tools/buildscripts/gyp_qtwebengine $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --")
}
ninja.target = invoke_ninja
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 91e9ab585..e2df54afe 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -53,7 +53,6 @@
#include "content/browser/renderer_host/ui_events_helper.h"
#include "content/common/gpu/gpu_messages.h"
#include "content/common/view_messages.h"
-#include "lib/type_conversion.h"
#include "third_party/WebKit/public/web/WebCursorInfo.h"
#include "ui/base/events/event.h"
#include "ui/gfx/size_conversions.h"
diff --git a/src/core/resources/resources.pro b/src/core/resources/resources.pro
index a9404f3ec..b0eba1246 100644
--- a/src/core/resources/resources.pro
+++ b/src/core/resources/resources.pro
@@ -2,6 +2,4 @@
# These files will then be bundled using the Qt Resource System.
TEMPLATE = aux
-system(python ../build/scripts/build_resources.py)
-
-
+system("python $$QTWEBENGINE_ROOT/tools/buildscripts/build_resources.py")
diff --git a/src/process/process.pro b/src/process/process.pro
index 6234d839f..9c02ec70c 100644
--- a/src/process/process.pro
+++ b/src/process/process.pro
@@ -12,7 +12,7 @@ qnx: QMAKE_RPATHLINKDIR += $${QNX_DIR}/$${QNX_CPUDIR}/usr/lib/qt5/lib
DESTDIR = $$getOutDir()/$$getConfigDir()
-INCLUDEPATH += ../lib
+INCLUDEPATH += ../core
SOURCES = main.cpp
diff --git a/src/src.pro b/src/src.pro
index bc0151536..59fcce66f 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,64 +1,22 @@
TEMPLATE = subdirs
-# The first three subdirs contain dummy .pro files that are used by qmake
-# to generate a corresponding .gyp file
-
-# Phony pro file that extracts things like compiler and linker from qmake
-qmake_extras.subdir = build/qmake_extras
-
-# Phony pro files that generate gyp files. Will be built by ninja.
-lib.depends = qmake_extras
-
-# API libraries
-webengine_lib.subdir = lib/quick
-webengine_lib.target = sub-webengine-lib
-webengine_lib.depends = build
-quick_plugin_lib.subdir = lib/quick/plugin
-quick_plugin_lib.target = sub-quick-plugin-lib
-quick_plugin_lib.depends = webengine_lib
-quick_experimental_plugin_lib.subdir = lib/quick/plugin/experimental
-quick_experimental_plugin_lib.target = sub-quick-experimental-plugin-lib
-quick_experimental_plugin_lib.depends = webengine_lib
-widgets_lib.subdir = lib/widgets
-widgets_lib.target = sub-widgets-lib
-widgets_lib.depends = build
-
-process.depends = build
-sub_examples.depends = quick_plugin_lib quick_experimental_plugin_lib
-sub_tests.depends = quick_plugin_lib quick_experimental_plugin_lib
-
-# This is where we use the generated gypi files and run gyp_qtwebengine
-build.depends = resources lib
-
-SUBDIRS += qmake_extras \
- resources \
- lib \
- process \
- build \
- webengine_lib \
- quick_plugin_lib \
- quick_experimental_plugin_lib
+process.depends = core
+webengine.depends = core
+webenginewidgets.depends = core
+webengine_plugin.subdir = webengine/plugin
+webengine_plugin.target = sub-webengine-plugin
+webengine_plugin.depends = webengine
+webengine_experimental_plugin.subdir = webengine/plugin/experimental
+webengine_experimental_plugin.target = sub-webengine-experimental-plugin
+webengine_experimental_plugin.depends = webengine
+
+
+SUBDIRS += core \
+ process \
+ webengine \
+ webengine_plugin \
+ webengine_experimental_plugin
qtHaveModule(widgets) {
- SUBDIRS += widgets_lib
- sub_examples.depends += widgets_lib
- sub_tests.depends += widgets_lib
+ SUBDIRS += webenginewidgets
}
-
-# Ninja executable location needs to be determined early for extra targets. Should be fetched from cache most of the time anyway.
-NINJA_EXECUTABLE = $$findOrBuildNinja()
-
-# Extra targets that invoke ninja on the desired configuration added for convenience
-release.target = release
-release.commands = $$NINJA_EXECUTABLE -C $$getOutDir()/Release
-release.depends: qmake
-
-debug.target = debug
-debug.commands = $$NINJA_EXECUTABLE -C $$getOutDir()/Debug
-debug.depends: qmake
-
-QMAKE_EXTRA_TARGETS += release \
- debug
-
-# Move this to the beginning of the project file as soon as we moved to the src layout
-load(qt_parts)
diff --git a/src/webengine/plugin/experimental/experimental.pro b/src/webengine/plugin/experimental/experimental.pro
index ad2e0b8a3..fb396c34e 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 93e04f97a..9dca82fe9 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 50353066b..ccf874358 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)
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 3338e0cf7..a78efaa6c 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -20,20 +20,20 @@ QMAKE_RPATHDIR += $$LIBPATH
DESTDIR = $$LIBPATH
-INCLUDEPATH += Api ../
+INCLUDEPATH += api ../core
SOURCES = \
- Api/qwebenginehistory.cpp \
- Api/qwebenginepage.cpp \
- Api/qwebengineview.cpp\
+ api/qwebenginehistory.cpp \
+ api/qwebenginepage.cpp \
+ api/qwebengineview.cpp\
render_widget_host_view_qt_delegate_widget.cpp
HEADERS = \
- Api/qtwebenginewidgetsglobal.h \
- Api/qwebenginehistory.h \
- Api/qwebenginepage.h \
- Api/qwebengineview.h \
- Api/qwebengineview_p.h \
+ api/qtwebenginewidgetsglobal.h \
+ api/qwebenginehistory.h \
+ api/qwebenginepage.h \
+ api/qwebengineview.h \
+ api/qwebengineview_p.h \
render_widget_host_view_qt_delegate_widget.h
load(qt_module)