thoughts

4 files changed, 21 insertions, 1 deletions

diff --git a/SConstruct b/SConstruct
index b52cf509..c7248251 100644
--- a/SConstruct
+++ b/SConstruct
@@ -623,6 +623,20 @@ if qt_env['QT_MAJOR_VERSION'] > 4:
     ]
 
 # Finally, set up rules to install the DLLs.
+# use windeployqt.exe to install all required libraries
+#SET(windeploy_parameters --no-translations --no-plugins --libdir dlls --release-with-debug-info --no-compiler-runtime)
+#INSTALL(
+#    CODE
+#    "EXECUTE_PROCESS(
+#        COMMAND
+#        ${qt5bin}/windeployqt.exe ModOrganizer.exe ${windeploy_parameters}
+#        COMMAND
+#        ${qt5bin}/windeployqt.exe uibase.dll ${windeploy_parameters}
+#        WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
+#    )"
+#)
+# this should probably be a rule though it seems to produce an awful lot of
+# Stuff(TM). or a postaction
 
 dll_path = os.path.join('$INSTALL_PATH', 'DLLs')
 
diff --git a/src/organizercore.h b/src/organizercore.h
index 5cfbaca4..f4cfabe7 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -89,7 +89,7 @@ public:
     m_ExecutablesList = executablesList;

   }

 

-  Profile *currentProfile() { return m_CurrentProfile; }

+  Profile *currentProfile() const { return m_CurrentProfile; }

   void setCurrentProfile(const QString &profileName);

 

   std::vector<QString> enabledArchives();

diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp
index ba07c154..b289b659 100644
--- a/src/organizerproxy.cpp
+++ b/src/organizerproxy.cpp
@@ -166,6 +166,11 @@ MOBase::IModList *OrganizerProxy::modList() const
   return m_Proxied->modList();

 }

 

+MOBase::IProfile *OrganizerProxy::profile() const

+{

+  return m_Proxied->currentProfile();

+}

+

 MOBase::IPluginGame const *OrganizerProxy::managedGame() const

 {

   return m_Proxied->managedGame();

diff --git a/src/organizerproxy.h b/src/organizerproxy.h
index 62a35498..95543ba3 100644
--- a/src/organizerproxy.h
+++ b/src/organizerproxy.h
@@ -37,6 +37,7 @@ public:
   virtual MOBase::IDownloadManager *downloadManager() const;

   virtual MOBase::IPluginList *pluginList() const;

   virtual MOBase::IModList *modList() const;

+  virtual MOBase::IProfile *profile() const override;

   virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "", const QString &profile = "");

   virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = nullptr) const;

   virtual void refreshModList(bool saveChanges);