diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:07:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 15:36:44 +0200 |
| commit | dbef41f43ece97d8ac4d6b63f7a36afcb7e7b7f7 (patch) | |
| tree | 334ebaec198a7f31d1e3a4639c70fbb8bb116af2 /tools | |
| parent | 52d30e2850769d589772576e4714a14241c7da6e (diff) | |
| parent | f57d8f1341587e6b2aa84b8404aa218432584206 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/qtestlib/tutorial5/containers.cpp
examples/widgets/tools/tools.pro
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_unix.cpp
src/corelib/io/qprocess_win.cpp
src/network/kernel/qdnslookup_unix.cpp
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/testlib/qtestcase.cpp
tools/configure/configureapp.cpp
Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 805db76196..ad045b932c 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1651,6 +1651,7 @@ void Configure::applySpecSpecifics() dictionary["DECORATIONS"] = "default windows styled"; } else if (platform() == QNX) { + dictionary[ "REDUCE_EXPORTS" ] = "yes"; dictionary["STACK_PROTECTOR_STRONG"] = "auto"; dictionary["SLOG2"] = "auto"; dictionary["QNX_IMF"] = "auto"; @@ -1660,6 +1661,7 @@ void Configure::applySpecSpecifics() dictionary[ "ANGLE" ] = "no"; dictionary[ "DYNAMICGL" ] = "no"; dictionary[ "FONT_CONFIG" ] = "auto"; + dictionary[ "ICU" ] = "auto"; dictionary[ "POLL" ] = "poll"; } else if (platform() == ANDROID) { dictionary[ "REDUCE_EXPORTS" ] = "yes"; |