diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-06 16:19:14 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-06 16:50:03 +0200 |
| commit | 1326cd15f7ba985551f0fddc717e3bfc01ddda85 (patch) | |
| tree | 024eb871ed5f4e8c02e21412475e6e9929a2b030 /config.tests/unix/icu/icu.pro | |
| parent | fe70367fe06984d1ac84cc276ca3fd3edc4193c7 (diff) | |
| parent | beb7258a56b6ec76531b73cc07ee30132a3f548f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/qnx-x86-qcc/qplatformdefs.h
src/corelib/global/qglobal.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
src/opengl/qglpixelbuffer.cpp
src/opengl/qglshaderprogram.cpp
tests/auto/opengl/qglthreads/tst_qglthreads.cpp
Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
Diffstat (limited to 'config.tests/unix/icu/icu.pro')
| -rw-r--r-- | config.tests/unix/icu/icu.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro index 2c1b431f92..16267ff827 100644 --- a/config.tests/unix/icu/icu.pro +++ b/config.tests/unix/icu/icu.pro @@ -1,6 +1,7 @@ SOURCES = icu.cpp CONFIG += console CONFIG -= qt dylib + win32 { CONFIG(static, static|shared) { CONFIG(debug, debug|release) { @@ -9,8 +10,8 @@ win32 { LIBS += -lsicuin -lsicuuc -lsicudt } } else { - LIBS += -licuin -licuuc + LIBS += -licuin -licuuc -licudt } } else { - LIBS += -licui18n -licuuc + LIBS += -licui18n -licuuc -licudata } |