diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2016-05-15 11:03:43 +0100 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2016-05-15 11:03:43 +0100 |
| commit | f5a815185ffc378bf0902eac4f03c54ab5be80f3 (patch) | |
| tree | 0baa3a5d9c8763f8c82519f81bdb15e9f5aa3906 | |
| parent | ba8464f01f5cd5340feea7163b9e51492c16fa8a (diff) | |
Updates for QT5.5
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | src/dlls.manifest.debug.qt5 | 6 | ||||
| -rw-r--r-- | src/dlls.manifest.qt5 | 8 |
3 files changed, 10 insertions, 8 deletions
@@ -669,7 +669,9 @@ if qt_env['QT_MAJOR_VERSION'] > 4: dlls_to_install += [ os.path.join(env['QTDIR'], 'bin', - 'icu%s%d%d.dll' % (lib, qt_env['QT_MAJOR_VERSION'], qt_env['QT_MINOR_VERSION'] - 1)) + 'icu%s%d%d.dll' % (lib, + qt_env['QT_MAJOR_VERSION'], + qt_env['QT_MINOR_VERSION'] - 1)) for lib in ('dt','in', 'uc') ] diff --git a/src/dlls.manifest.debug.qt5 b/src/dlls.manifest.debug.qt5 index 59497baa..a2f75206 100644 --- a/src/dlls.manifest.debug.qt5 +++ b/src/dlls.manifest.debug.qt5 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity type="win32" name="dlls" version="1.0.0.0" processorArchitecture="x86"/>
- <file name="icuin53.dll"/>
- <file name="icuuc53.dll"/>
- <file name="icudt53.dll"/>
+ <file name="icuin54.dll"/>
+ <file name="icuuc54.dll"/>
+ <file name="icudt54.dll"/>
<file name="Qt5Cored.dll"/>
<file name="Qt5Declaratived.dll"/>
<file name="Qt5Guid.dll"/>
diff --git a/src/dlls.manifest.qt5 b/src/dlls.manifest.qt5 index 76206f21..5c64e4f9 100644 --- a/src/dlls.manifest.qt5 +++ b/src/dlls.manifest.qt5 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity type="win32" name="dlls" version="1.0.0.0" processorArchitecture="x86"/>
- <file name="icuin53.dll"/>
- <file name="icuuc53.dll"/>
- <file name="icudt53.dll"/>
+ <file name="icuin54.dll"/>
+ <file name="icuuc54.dll"/>
+ <file name="icudt54.dll"/>
<file name="Qt5Core.dll"/>
<file name="Qt5Declarative.dll"/>
<file name="Qt5Gui.dll"/>
@@ -26,4 +26,4 @@ <file name="Qt5WinExtras.dll"/>
<file name="Qt5Xml.dll"/>
<file name="Qt5XmlPatterns.dll"/>
-</assembly>
\ No newline at end of file +</assembly>
|