diff options
author | Michael BrĂ¼ning <michael.bruning@digia.com> | 2014-09-09 18:11:33 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2014-09-24 12:09:52 +0200 |
commit | 03dbb63f236b4248fdbfe158d57badb478e801b3 (patch) | |
tree | fee28e866a95a7f4af914125761236238ccd9f0a /tests | |
parent | d3330dd40f2904f06dce4b3a40924803e03646e1 (diff) |
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>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 1 | ||||
-rw-r--r-- | tests/auto/quick/shared/qt_webengine_quicktest.h | 1 |
2 files changed, 0 insertions, 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(); \ |