summaryrefslogtreecommitdiff
path: root/src/installationmanager.cpp
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2013-06-15 14:42:20 +0200
committerTannin <devnull@localhost>2013-06-15 14:42:20 +0200
commit49cbe0349184419530d22782cc670946b61c9f01 (patch)
treea73c952c93f0624771df97fa9b2b724b51ed0956 /src/installationmanager.cpp
parent6069decb159ec30b7a69649294ee0e89783bb717 (diff)
- 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
Diffstat (limited to 'src/installationmanager.cpp')
-rw-r--r--src/installationmanager.cpp9
1 files changed, 9 insertions, 0 deletions
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
}