diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-11 16:45:53 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-11 16:45:53 +0200 |
| commit | 4ef8f47fc55197fc8b90a1f43f87d8aba5c66ffa (patch) | |
| tree | b2a60ea38ae7240447d28cdd5d943ecc24a14dde /lib | |
| parent | e67c21a033121618bfe4cf62686d009d0bacd8c3 (diff) | |
Rename remaining references of blinq to QtWebEngine.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/lib.pro | 6 | ||||
| -rw-r--r-- | lib/web_engine_context.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/lib.pro b/lib/lib.pro index 4db81a6f8..f86bf8ac6 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -2,17 +2,17 @@ # 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:blinq_shared +GYPDEPENDENCIES += ../shared/shared.gyp:qtwebengine_shared TEMPLATE = lib -TARGET = blinq +TARGET = Qt5WebEngine # Defining keywords such as 'signal' clashes with the chromium code base. DEFINES += QT_NO_KEYWORDS # We need a way to tap into gyp´s Debug vs. Release configuration -PER_CONFIG_DEFINES = BLINQ_PROCESS_PATH=\\\"$$getOutDir()/%config/$$BLINQ_PROCESS_NAME\\\" +PER_CONFIG_DEFINES = QTWEBENGINEPROCESS_PATH=\\\"$$getOutDir()/%config/$$QTWEBENGINEPROCESS_NAME\\\" # Keep Skia happy CONFIG(release, debug|release): DEFINES += NDEBUG diff --git a/lib/web_engine_context.cpp b/lib/web_engine_context.cpp index 5b9855a27..2f34c24b4 100644 --- a/lib/web_engine_context.cpp +++ b/lib/web_engine_context.cpp @@ -75,19 +75,19 @@ static inline base::FilePath::StringType qStringToStringType(const QString &str) static QByteArray subProcessPath() { static bool initialized = false; -#ifdef BLINQ_PROCESS_PATH - static QByteArray processPath(BLINQ_PROCESS_PATH); +#ifdef QTWEBENGINEPROCESS_PATH + static QByteArray processPath(QTWEBENGINEPROCESS_PATH); #else static QByteArray processPath; #endif if (initialized) return processPath; // Allow overriding at runtime for the time being. - const QByteArray fromEnv = qgetenv("BLINQ_PROCESS_PATH"); + const QByteArray fromEnv = qgetenv("QTWEBENGINEPROCESS_PATH"); if (!fromEnv.isEmpty()) processPath = fromEnv; if (processPath.isEmpty()) - qFatal("BLINQ_PROCESS_PATH environment variable not set or empty."); + qFatal("QTWEBENGINEPROCESS_PATH environment variable not set or empty."); initialized = true; return processPath; } |