From f8c683f700a3fff30540ff343df2bfba15080e86 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Thu, 20 Jun 2013 21:55:37 +0200
Subject: - some fixes for qt5 compatibility - hook.dll no longer creates a
 dump and uninstalls it if an exception is reported that doesn't originate
 from it - NCC used read-only transactions again because otherwise solid
 archives become unusably slow. - removed the integrated nexus browser - the
 mod description and motd are now rendered in QTextBrowser. This (and the
 above) eliminates the dependency on qtwebkit - removed the direct file
 download for mod files - reduced CPU usage during downloads by invalidating
 only one column of the download list. This widget still needs to be replaced
 - added the complete filename as an option for the modname - applications
 that require elevation can now be started by invoking an elevated secondary
 ModOrganizer instance - MO will now register nexus file servers and provides
 a settings dialog to pick preferred servers. (This preference is not used
 yet) - worked around 1-2 bugs in QSortFilterProxy - handling of nxm links is
 now done by an external application. This allows the registration of
 different applications depending on the game - integrated fomod installer now
 displays the screenshot in a scalable view - bugfix: integrated fomod
 installer didn't name output files correctly if the name differs from the
 source name - bugfix: a successful login to nexus was (sometimes?) not
 correctly detected as a success - bugfix: top-level entries in
 QtGroupingProxy were sometimes incorrectly displayed as groups - bugfix:
 GetPrivateProfile... optimization could cause null-pointer indirection -
 bugfix: GetCurrentWorkingDirectory caused buffer overflow in case of
 pre-flighting (buffer size 0) - bugfix: configurator plugin now also uses qt5
 (it's currently broken though)

---
 src/main.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 93b9d5c6..f93e9dec 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -179,7 +179,17 @@ void cleanupDir()
     "QtNetwork4.dll",
     "QtXml4.dll",
     "QtWebKit4.dll",
-    "qjpeg4.dll"
+    "qjpeg4.dll",
+    "dlls/phonon4.dll",
+    "dlls/QtCore4.dll",
+    "dlls/QtGui4.dll",
+    "dlls/QtNetwork4.dll",
+    "dlls/QtXml4.dll",
+    "dlls/QtXmlPatterns4.dll",
+    "dlls/QtWebKit4.dll",
+    "dlls/QtDeclarative4.dll",
+    "dlls/QtScript4.dll",
+    "dlls/QtSql4.dll"
   };
 
   static const int NUM_FILES = sizeof(fileNames) / sizeof(QString);
@@ -304,14 +314,14 @@ int main(int argc, char *argv[])
 
   QStringList arguments = application.arguments();
 
-  bool update = false;
+  bool forcePrimary = false;
   if (arguments.contains("update")) {
     arguments.removeAll("update");
-    update = true;
+    forcePrimary = true;
   }
 
   try {
-    SingleInstance instance(update);
+    SingleInstance instance(forcePrimary);
     if (!instance.primaryInstance()) {
       if ((arguments.size() == 2) && isNxmLink(arguments.at(1))) {
         qDebug("not primary instance, sending download message");
-- 
cgit v1.3.1