From 49cbe0349184419530d22782cc670946b61c9f01 Mon Sep 17 00:00:00 2001 From: Tannin Date: Sat, 15 Jun 2013 14:42:20 +0200 Subject: - completed Qt5 compatibility - added GetFileVerisonInfoW hook for Windows 8 compatibility - fixed BossDummy to compile correctly with current version of the RGiesecke.DllExport assembly - fixed NCC components compiling with different Framewerk versions - dropped files-list in Nexus-tab of modinfo dialog --- src/installationmanager.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/installationmanager.cpp') diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp index b8cfbcb8..7b09c7b6 100644 --- a/src/installationmanager.cpp +++ b/src/installationmanager.cpp @@ -82,6 +82,7 @@ InstallationManager::InstallationManager(QWidget *parent) throw MyException(getErrorString(m_CurrentArchive->getLastError())); } + m_InstallationProgress.setWindowFlags(m_InstallationProgress.windowFlags() & (~Qt::WindowContextHelpButtonHint)); } @@ -385,13 +386,21 @@ void InstallationManager::updateProgress(float percentage) void InstallationManager::updateProgressFile(LPCWSTR fileName) { +#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) + m_InstallationProgress.setLabelText(QString::fromWCharArray(fileName)); +#else m_InstallationProgress.setLabelText(QString::fromUtf16(fileName)); +#endif } void InstallationManager::report7ZipError(LPCWSTR errorMessage) { +#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) + m_InstallationProgress.setLabelText(QString::fromWCharArray(errorMessage)); +#else reportError(QString::fromUtf16(errorMessage)); +#endif } -- cgit v1.3.1