summaryrefslogtreecommitdiffstats
path: root/libsettings
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-02-25 14:44:36 -0600
committerAndrew <forkk@forkk.net>2013-02-25 14:44:36 -0600
commit4ca35a760dfc53fd69f0f2030868ebeda250ed59 (patch)
tree1fa312da2d051676830e222b3959a100a2fa6e05 /libsettings
parentb56b819c35843db0d135a5bbbee5fc9916bd06df (diff)
downloadMultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.tar
MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.tar.gz
MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.tar.lz
MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.tar.xz
MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.zip
Fixed a lot of MSVC problems
Diffstat (limited to 'libsettings')
-rw-r--r--libsettings/include/settingsobject.h5
-rw-r--r--libsettings/src/settingsobject.cpp2
2 files changed, 7 insertions, 0 deletions
diff --git a/libsettings/include/settingsobject.h b/libsettings/include/settingsobject.h
index 3f09b72c..f35d01b1 100644
--- a/libsettings/include/settingsobject.h
+++ b/libsettings/include/settingsobject.h
@@ -162,4 +162,9 @@ private:
QMap<QString, Setting *> m_settings;
};
+/*!
+ * \brief A global settings object.
+ */
+LIBMMCSETTINGS_EXPORT extern SettingsObject *globalSettings;
+
#endif // SETTINGSOBJECT_H
diff --git a/libsettings/src/settingsobject.cpp b/libsettings/src/settingsobject.cpp
index 27fbb40a..98c7b479 100644
--- a/libsettings/src/settingsobject.cpp
+++ b/libsettings/src/settingsobject.cpp
@@ -18,6 +18,8 @@
#include <QVariant>
+SettingsObject *globalSettings;
+
SettingsObject::SettingsObject(QObject *parent) :
QObject(parent)
{