diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-12 07:49:03 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-12 07:49:03 +0200 |
| commit | a9ac6da893ac10ce160c9eb80141508881cd71e2 (patch) | |
| tree | 0e74067407612d44ad07ff74cb7be6d444ee28c5 /tools | |
| parent | 8eb5ba3b9cb1e8e07f28a3153672a946b2d82fd9 (diff) | |
| parent | 687461627310e8b781da15d1a907c35bd8ffea6e (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/gui/text/qfont_qpa.cpp
src/gui/widgets/qlinecontrol.cpp
src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
tests/auto/gui.pro
tests/auto/network.pro
tests/auto/qstring/tst_qstring.cpp
Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 2df07ef535..51b25ec8a2 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2727,6 +2727,9 @@ void Configure::generateOutputVars() // We currently have no switch for QtSvg, so add it unconditionally. qtConfig += "svg"; + if (dictionary[ "V8" ] == "yes") + qtConfig += "v8"; + // Add config levels -------------------------------------------- QStringList possible_configs = QStringList() << "minimal" |