diff options
| -rw-r--r-- | autotests/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cmake/rules_PyKF5.py | 5 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/core/kconfigdata.h | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index 6d259881..96c7b65e 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -16,7 +16,8 @@ if(NOT Qt5Concurrent_FOUND) return() endif() -set(kentrymaptest_SRCS kentrymaptest.cpp) +# compile KEntryMap into the test since it's not exported +set(kentrymaptest_SRCS kentrymaptest.cpp ../src/core/kconfigdata.cpp) ecm_add_test(${kentrymaptest_SRCS} TEST_NAME kentrymaptest LINK_LIBRARIES KF5::ConfigCore Qt5::Test diff --git a/cmake/rules_PyKF5.py b/cmake/rules_PyKF5.py index 7d3f041e..72bee90b 100644 --- a/cmake/rules_PyKF5.py +++ b/cmake/rules_PyKF5.py @@ -107,6 +107,11 @@ def local_function_rules(): ["KEntryMap", "setEntryOption", ".*", ".*", ".*", rules_engine.function_discard], ["KEntryMap", "findEntry", ".*", ".*", ".*", rules_engine.function_discard], ["KEntryMap", "findExactEntry", ".*", ".*", ".*", rules_engine.function_discard], + + ["KConfigBackend", "registerMappings", ".*", ".*", ".*", rules_engine.function_discard], + ["KConfigBackend", "parseConfig", ".*", ".*", ".*", rules_engine.function_discard], + ["KConfigBackend", "writeConfig", ".*", ".*", ".*", rules_engine.function_discard], + ] def local_typedef_rules(): diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 83e4f76e..72a46b91 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -68,7 +68,6 @@ if (PythonModuleGeneration_FOUND) kconfig.h kconfigbackend.h kconfigbase.h - kconfigdata.h kconfiggroup.h kdesktopfile.h ksharedconfig.h diff --git a/src/core/kconfigdata.h b/src/core/kconfigdata.h index 5839dfd4..a2430169 100644 --- a/src/core/kconfigdata.h +++ b/src/core/kconfigdata.h @@ -157,7 +157,7 @@ QDebug operator<<(QDebug dbg, const KEntry &entry); * with the group name. * @internal */ -class KCONFIGCORE_EXPORT KEntryMap : public QMap<KEntryKey, KEntry> +class KEntryMap : public QMap<KEntryKey, KEntry> { public: enum SearchFlag { |