diff options
| author | Sky <git@bunnies.cc> | 2013-11-06 17:02:23 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-11-06 17:02:23 +0000 |
| commit | 7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a (patch) | |
| tree | 2753d1ee11dad2cf1c4ce1e8a28ead92214f2f1c /depends/settings/include/libsettings_config.h | |
| parent | dc3b0fcb2b74aeede37b08216b203cab284f7fce (diff) | |
| parent | bba4ed5ab2c98c3d60a141d6a089a49716753615 (diff) | |
| download | MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.gz MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.lz MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.xz MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.zip | |
Merge branch 'develop'
Diffstat (limited to 'depends/settings/include/libsettings_config.h')
| -rw-r--r-- | depends/settings/include/libsettings_config.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/depends/settings/include/libsettings_config.h b/depends/settings/include/libsettings_config.h index 2ecfe1c1..ba77f640 100644 --- a/depends/settings/include/libsettings_config.h +++ b/depends/settings/include/libsettings_config.h @@ -3,7 +3,7 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software @@ -18,11 +18,11 @@ #include <QtCore/QtGlobal> #ifdef LIBSETTINGS_STATIC - #define LIBSETTINGS_EXPORT +#define LIBSETTINGS_EXPORT +#else +#ifdef LIBSETTINGS_LIBRARY +#define LIBSETTINGS_EXPORT Q_DECL_EXPORT #else - #ifdef LIBSETTINGS_LIBRARY - #define LIBSETTINGS_EXPORT Q_DECL_EXPORT - #else - #define LIBSETTINGS_EXPORT Q_DECL_IMPORT - #endif +#define LIBSETTINGS_EXPORT Q_DECL_IMPORT +#endif #endif |