- re-enabled building of loot_cli and started developing against the new api

- extended set of default categories
- more tolerand bbcode parser
- added a few colors for the bbcode parser
- more fixes to qt5 compatibility
- started work on ability to unloading (and thus re-loading) of plugins
- names of plugins are no longer localizable (because those names are also used to store settings)
- added settings to disable individual diagnosis settings
- path of dependencies is now configured in a .pri file instead of environment variablees
- bugfix: if the modid-input is canceled, the id was saved as -1 and wasn't re-requested from the user
- bugfix: moving files with the SHFileOperation-Api didn't update the vfs correctly (still not perfect but better)
- bugfix: attempt to remove the deleter-file seems to have caused error messages for some users
- bugfix: fixed a couple of cases that might have caused the tutorial to hang

1 files changed, 11 insertions, 1 deletions

diff --git a/src/main.cpp b/src/main.cpp
index a21f41e4..3198208a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -311,9 +311,19 @@ int main(int argc, char *argv[])
   }

 

   QString dataPath = instanceID.isEmpty() ? application.applicationDirPath()

-                                          : QDir::fromNativeSeparators(QDesktopServices::storageLocation(QDesktopServices::DataLocation)) + "/" + instanceID;

+                                          : QDir::fromNativeSeparators(

+#if QT_VERSION >= 0x050000

+                                              QStandardPaths::writableLocation(QStandardPaths::DataLocation)

+#else

+                                              QDesktopServices::storageLocation(QDesktopServices::DataLocation)

+#endif

+                                              ) + "/" + instanceID;

   application.setProperty("dataPath", dataPath);

 

+#if QT_VERSION >= 0x050000

+  qDebug("ssl support: %d", QSslSocket::supportsSsl());

+#endif

+

   qDebug("data path: %s", qPrintable(dataPath));

   if (!QDir(dataPath).exists()) {

     if (!QDir().mkpath(dataPath)) {