diff options
| author | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-03-22 14:40:55 +0100 |
|---|---|---|
| committer | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-03-22 14:40:55 +0100 |
| commit | e4f86893a899ee86cfa6d238f891bec04977c966 (patch) | |
| tree | cde559857f443d530930bce3f74eb6e64b500f52 /libsettings | |
| parent | cd1fdbbbc2953c5e34d8c0ae6861bec4a7f6532e (diff) | |
| download | MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.tar MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.tar.gz MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.tar.lz MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.tar.xz MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.zip | |
fix merge issues, make console window work again
Diffstat (limited to 'libsettings')
| -rw-r--r-- | libsettings/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | libsettings/include/keyring.h | 5 | ||||
| -rw-r--r-- | libsettings/src/stubkeyring.h | 1 |
3 files changed, 12 insertions, 5 deletions
diff --git a/libsettings/CMakeLists.txt b/libsettings/CMakeLists.txt index 9ae48354..e5aae0b7 100644 --- a/libsettings/CMakeLists.txt +++ b/libsettings/CMakeLists.txt @@ -18,6 +18,12 @@ include/overridesetting.h include/basicsettingsobject.h include/inisettingsobject.h + +include/keyring.h +) + +SET(LIBSETTINGS_HEADERS_PRIVATE +src/stubkeyring.h ) SET(LIBSETTINGS_SOURCES @@ -29,6 +35,9 @@ src/overridesetting.cpp src/basicsettingsobject.cpp src/inisettingsobject.cpp + +src/keyring.cpp +src/stubkeyring.cpp ) # Set the include dir path. @@ -37,6 +46,6 @@ include_directories(${LIBSETTINGS_INCLUDE_DIR}) add_definitions(-DLIBSETTINGS_LIBRARY) -add_library(libSettings SHARED ${LIBSETTINGS_SOURCES} ${LIBSETTINGS_HEADERS}) +add_library(libSettings SHARED ${LIBSETTINGS_SOURCES} ${LIBSETTINGS_HEADERS} ${LIBSETTINGS_HEADERS_PRIVATE}) qt5_use_modules(libSettings Core) target_link_libraries(libSettings) diff --git a/libsettings/include/keyring.h b/libsettings/include/keyring.h index afdc3bba..5774e287 100644 --- a/libsettings/include/keyring.h +++ b/libsettings/include/keyring.h @@ -18,7 +18,7 @@ #ifndef KEYRING_H #define KEYRING_H -#include <QObject> +#include <QString> #include "libsettings_config.h" @@ -31,9 +31,8 @@ * @brief The Keyring class * the System Keyring/Keychain/Wallet/Vault/etc */ -class LIBMMCSETTINGS_EXPORT Keyring : public QObject +class LIBSETTINGS_EXPORT Keyring { - Q_OBJECT public: /** * @brief the System Keyring instance diff --git a/libsettings/src/stubkeyring.h b/libsettings/src/stubkeyring.h index 0566d5ab..b5f04e4c 100644 --- a/libsettings/src/stubkeyring.h +++ b/libsettings/src/stubkeyring.h @@ -24,7 +24,6 @@ class StubKeyring : public Keyring { - Q_OBJECT public: virtual bool storePassword(QString service, QString username, QString password); virtual QString getPassword(QString service, QString username); |