From 03dbb63f236b4248fdbfe158d57badb478e801b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@digia.com>
Date: Tue, 9 Sep 2014 18:11:33 +0200
Subject: [PATCH] Remove unneeded QWP_PATH environment variable for quick
tests.
When the PATH is properly set up, this should not be necessary
and it overrode the explicitly set QTWEBENGINEPROCESS_PATH.
Change-Id: Ie83a9f4f15f2203329c44fd9653adbb19c62672c
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
tests/auto/quick/qmltests/qmltests.pro | 1 -
tests/auto/quick/shared/qt_webengine_quicktest.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro
index b4514edc9..b25878dc9 100644
--- a/tests/auto/quick/qmltests/qmltests.pro
+++ b/tests/auto/quick/qmltests/qmltests.pro
@@ -34,4 +34,3 @@ OTHER_FILES += \
load(qt_build_paths)
DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD$${QMAKE_DIR_SEP}data\\\"\"
-DEFINES += QWP_PATH=\"\\\"$${MODULE_BASE_OUTDIR}$${QMAKE_DIR_SEP}libexec$${QMAKE_DIR_SEP}$${QTWEBENGINEPROCESS_NAME}\\\"\"
diff --git a/tests/auto/quick/shared/qt_webengine_quicktest.h b/tests/auto/quick/shared/qt_webengine_quicktest.h
index 2fd168e9d..4c4087ae6 100644
--- a/tests/auto/quick/shared/qt_webengine_quicktest.h
+++ b/tests/auto/quick/shared/qt_webengine_quicktest.h
@@ -69,7 +69,6 @@ QT_BEGIN_NAMESPACE
int main(int argc, char **argv) \
{ \
Application* app = 0; \
- qputenv("QTWEBENGINEPROCESS_PATH", QWP_PATH); \
if (!QCoreApplication::instance()) \
app = new Application(argc, argv); \
QtWebEngine::initialize(); \
--
GitLab