diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-06 14:35:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-14 09:11:07 +0200 |
| commit | 18c42734c0f7668b184c81ca6e77eb0a6cff4f14 (patch) | |
| tree | f92314277e327f7119c9632a8f2798a8820f69ec | |
| parent | 0b6f959022700ecf9374bdbb13772242d3f7e617 (diff) | |
| download | qtwebkit-18c42734c0f7668b184c81ca6e77eb0a6cff4f14.tar.gz | |
Check for ICU at configure time the same way we add it later
Use pkg-config to get the right ICU library when searching for it at
config time. This matches how it is build with later.
Task-number: QTBUG-41750
Change-Id: I134ecdeb523eab225ef66f4dcc14ae4e25ea4eca
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | Tools/qmake/config.tests/icu/icu.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Tools/qmake/config.tests/icu/icu.pro b/Tools/qmake/config.tests/icu/icu.pro index 66346e4d5..0486c531a 100644 --- a/Tools/qmake/config.tests/icu/icu.pro +++ b/Tools/qmake/config.tests/icu/icu.pro @@ -12,6 +12,8 @@ win32 { } else { LIBS += -licuin -licuuc -licudt } +} else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n") { + PKGCONFIG += icu-i18n } else { LIBS += -licui18n -licuuc -licudata } |