diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 10:30:20 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 10:30:20 +0100 |
| commit | d588ec795bf905d6d4a4827ad74f3d01315e40bf (patch) | |
| tree | 67227f80379d77962602b758093251b593ee0c08 /src/qmltest/qmltest.pro | |
| parent | 13e88fe2b9b1680cb161a249289c3ba998f08c0c (diff) | |
| parent | fdc18a5f25ba1c4cf35e1fa6f21272167bde36a9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/quick/items/qquickrectangle.cpp
Change-Id: Ia40bc0f2f08b5be68e32eb1e1f118445d20e44fc
Diffstat (limited to 'src/qmltest/qmltest.pro')
| -rw-r--r-- | src/qmltest/qmltest.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro index 952ef24922..4b4c06b27e 100644 --- a/src/qmltest/qmltest.pro +++ b/src/qmltest/qmltest.pro @@ -4,6 +4,10 @@ DEFINES += QT_NO_URL_CAST_FROM_STRING QT = core QT_PRIVATE = testlib-private quick qml-private gui core-private +# Testlib is only a private dependency, which results in our users not +# inheriting CONFIG+=console transitively. Make it explicit. +MODULE_CONFIG = console + !contains(QT_CONFIG, no-widgets) { QT += widgets DEFINES += QT_QMLTEST_WITH_WIDGETS |