diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-20 15:15:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-21 13:21:12 +0100 |
| commit | 4874b4c0cff423aae073d8bf15d726cbb92061e4 (patch) | |
| tree | 0274ef1c7e7235ddd323ceaa907082b2f3db5c61 /process | |
| parent | f56da89e1f8091843c43db278d97750e1ecc405b (diff) | |
Make QtWebEngineProcess a slim executable.
Move all the process code in the core library and let the later simply
call its QtWebEngine::processMain exported function from its main.
This also allows us building QtWebEngineProcess directly with qmake
without going through gyp.
Change-Id: I8df36510d0bf14e313918bef807e2118f1ecadd5
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'process')
| -rw-r--r-- | process/main.cpp | 4 | ||||
| -rw-r--r-- | process/process.pro | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/process/main.cpp b/process/main.cpp index 839b626c3..800dbdcfa 100644 --- a/process/main.cpp +++ b/process/main.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "content/public/app/content_main.h" +#include "process_main.h" int main(int argc, const char **argv) { - return content::ContentMain(argc, argv, 0); + return QtWebEngine::processMain(argc, argv); } diff --git a/process/process.pro b/process/process.pro index 11a7880f2..8edf22bf2 100644 --- a/process/process.pro +++ b/process/process.pro @@ -1,11 +1,13 @@ -# This is a dummy .pro file used to extract some aspects of the used configuration and feed them to gyp -# 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 -GYPDEPENDENCIES += ../shared/shared.gyp:qtwebengine_shared -GYPINCLUDES += ../qtwebengine.gypi - TARGET = $$QTWEBENGINEPROCESS_NAME TEMPLATE = app +macx:LIBPATH = $$getOutDir()/$$getConfigDir() +else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib +LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH +QMAKE_RPATHDIR += $$LIBPATH + +DESTDIR = $$getOutDir()/$$getConfigDir() + +INCLUDEPATH += ../lib + SOURCES = main.cpp |