Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2016-11-17 12:28:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2016-10-28 12:17:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kconfig.new/kconfig.changes 2016-11-17 12:28:11.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Nov 5 20:21:33 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.28.0 + * Make sure we don't break compilation with past broken units + * Don't be fatal on File field not being properly parsed + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.28.0.php + +------------------------------------------------------------------- Old: ---- kconfig-5.27.0.tar.xz New: ---- kconfig-5.28.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.FxV8sO/_old 2016-11-17 12:28:12.000000000 +0100 +++ /var/tmp/diff_new_pack.FxV8sO/_new 2016-11-17 12:28:12.000000000 +0100 @@ -18,9 +18,9 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.27 +%define _tar_path 5.28 Name: kconfig -Version: 5.27.0 +Version: 5.28.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kconfig-5.27.0.tar.xz -> kconfig-5.28.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/CMakeLists.txt new/kconfig-5.28.0/CMakeLists.txt --- old/kconfig-5.27.0/CMakeLists.txt 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/CMakeLists.txt 2016-11-07 13:18:27.000000000 +0100 @@ -3,7 +3,7 @@ project(KConfig) include(FeatureSummary) -find_package(ECM 5.27.0 NO_MODULE) +find_package(ECM 5.28.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -23,7 +23,7 @@ include(ECMMarkNonGuiExecutable) include(ECMPoQmTools) -set(KF5_VERSION "5.27.0") # handled by release scripts +set(KF5_VERSION "5.28.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCONFIG VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kconfig_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/KF5ConfigMacros.cmake new/kconfig-5.28.0/KF5ConfigMacros.cmake --- old/kconfig-5.27.0/KF5ConfigMacros.cmake 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/KF5ConfigMacros.cmake 2016-11-07 13:18:27.000000000 +0100 @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -macro (KCONFIG_ADD_KCFG_FILES _sources ) +function (KCONFIG_ADD_KCFG_FILES _sources ) foreach (_current_ARG ${ARGN}) if( ${_current_ARG} STREQUAL "GENERATE_MOC" ) set(_kcfg_generatemoc TRUE) @@ -43,6 +43,8 @@ endif() endforeach () + set(sources) + foreach (_current_FILE ${ARGN}) if(NOT ${_current_FILE} STREQUAL "GENERATE_MOC" AND NOT ${_current_FILE} STREQUAL "USE_RELATIVE_PATH") @@ -61,12 +63,23 @@ get_filename_component(_basename ${_tmp_FILE} NAME_WE) # If we had a relative path and we're asked to use it, then change the basename accordingly - if(NOT ${_rel_PATH} STREQUAL "") + if(_rel_PATH) set(_basename ${_rel_PATH}/${_basename}) endif() file(READ ${_tmp_FILE} _contents) - string(REGEX REPLACE "^(.*\n)?File=([^\n]+kcfg).*\n.*$" "\\2" _kcfg_FILENAME "${_contents}") + string(REGEX MATCH "File=([^\n]+\\.kcfg)\n" "" "${_contents}") + set(_kcfg_FILENAME "${CMAKE_MATCH_1}") + if (NOT _kcfg_FILENAME) + string(REGEX MATCH "File=([^\n]+\\.kcfg).*\n" "" "${_contents}") + if(CMAKE_MATCH_1) + message(WARNING "${_tmp_FILE}: Broken \"File\" field, make sure it's pointing at the right file") + set(_kcfg_FILENAME "${CMAKE_MATCH_1}") + else() + message(WARNING "Couldn't read the \"File\" field in ${_tmp_FILE}") + set(_kcfg_FILENAME "${_basename}.kcfg") + endif() + endif() set(_src_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) set(_header_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) set(_moc_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc) @@ -77,7 +90,7 @@ endif() if(NOT EXISTS "${_kcfg_FILE}") - message(ERROR "${_kcfg_FILENAME} not found; tried in ${_abs_PATH} and ${CMAKE_CURRENT_BINARY_DIR}") + message(FATAL_ERROR "${_kcfg_FILENAME} not found; tried in ${_abs_PATH} and ${CMAKE_CURRENT_BINARY_DIR}") endif() # make sure the directory exist in the build directory @@ -93,13 +106,16 @@ DEPENDS ${_kcfg_FILE}) if(_kcfg_generatemoc) - qt5_generate_moc(${_header_FILE} ${_moc_FILE} ) - set_source_files_properties(${_src_FILE} PROPERTIES SKIP_AUTOMOC TRUE) # don't run automoc on this file - list(APPEND ${_sources} ${_moc_FILE}) + list(APPEND sources ${_moc_FILE}) + qt5_generate_moc(${_header_FILE} ${_moc_FILE}) + set_property(SOURCE ${_src_FILE} PROPERTY SKIP_AUTOMOC TRUE) # don't run automoc on this file + set_property(SOURCE ${_src_FILE} APPEND PROPERTY OBJECT_DEPENDS ${_moc_FILE} ) endif() - list(APPEND ${_sources} ${_src_FILE} ${_header_FILE}) + list(APPEND sources ${_src_FILE} ${_header_FILE}) endif(NOT ${_current_FILE} STREQUAL "GENERATE_MOC" AND NOT ${_current_FILE} STREQUAL "USE_RELATIVE_PATH") endforeach (_current_FILE) -endmacro (KCONFIG_ADD_KCFG_FILES) + set(${_sources} ${${_sources}} ${sources} PARENT_SCOPE) + +endfunction(KCONFIG_ADD_KCFG_FILES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/autotests/kconfig_compiler/CMakeLists.txt new/kconfig-5.28.0/autotests/kconfig_compiler/CMakeLists.txt --- old/kconfig-5.27.0/autotests/kconfig_compiler/CMakeLists.txt 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/autotests/kconfig_compiler/CMakeLists.txt 2016-11-07 13:18:27.000000000 +0100 @@ -10,26 +10,10 @@ # make sure the generated headers can be found include_directories(${KCFG_OUTPUT_DIR}) +include(${CMAKE_SOURCE_DIR}/KF5ConfigMacros.cmake) macro(GEN_KCFG_TEST_SOURCE _testName _srcs) - cmake_parse_arguments(ARG "" "KCFG" "" ${ARGN} ) - set(_kcfgFile ${ARG_KCFG}) - if (NOT _kcfgFile) - set(_kcfgFile "${_testName}.kcfg") - endif() - add_custom_command( - OUTPUT ${KCFG_OUTPUT_DIR}/${_testName}.cpp ${KCFG_OUTPUT_DIR}/${_testName}.h - COMMAND KF5::kconfig_compiler ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfgFile} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc - WORKING_DIRECTORY ${KCFG_OUTPUT_DIR} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfgFile} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc KF5::kconfig_compiler) - - # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) - qt5_generate_moc(${KCFG_OUTPUT_DIR}/${_testName}.h ${KCFG_OUTPUT_DIR}/${_testName}.moc ) - # do not run automoc on the generated file - set_source_files_properties(${KCFG_OUTPUT_DIR}/${_testName}.cpp PROPERTIES SKIP_AUTOMOC TRUE) - - set( ${_srcs} ${${_srcs}} ${KCFG_OUTPUT_DIR}/${_testName}.cpp) - set_property(SOURCE ${KCFG_OUTPUT_DIR}/${_testName}.cpp APPEND PROPERTY OBJECT_DEPENDS ${KCFG_OUTPUT_DIR}/${_testName}.moc ) -endmacro(GEN_KCFG_TEST_SOURCE) + KCONFIG_ADD_KCFG_FILES(${_srcs} ${_testName}.kcfgc ${ARGN}) +endmacro() include(ECMMarkAsTest) @@ -181,7 +165,7 @@ set(test13_SRCS test13main.cpp ) -gen_kcfg_test_source(test13 test13_SRCS) +gen_kcfg_test_source(test13 test13_SRCS GENERATE_MOC) ecm_add_test(TEST_NAME test13 ${test13_SRCS}) target_link_libraries(test13 KF5::ConfigGui) @@ -200,17 +184,17 @@ ########### next target ############### set(test_signal_SRCS test_signal_main.cpp ) -gen_kcfg_test_source(test_signal test_signal_SRCS) +gen_kcfg_test_source(test_signal test_signal_SRCS GENERATE_MOC) ecm_add_test(TEST_NAME test_signal ${test_signal_SRCS}) target_link_libraries(test_signal KF5::ConfigGui) ########### next target ############### set(kconfigcompiler_test_signals_SRCS kconfigcompiler_test_signals.cpp) -gen_kcfg_test_source(signals_test_singleton kconfigcompiler_test_signals_SRCS KCFG signals_test.kcfg) -gen_kcfg_test_source(signals_test_no_singleton kconfigcompiler_test_signals_SRCS KCFG signals_test.kcfg) -gen_kcfg_test_source(signals_test_singleton_dpointer kconfigcompiler_test_signals_SRCS KCFG signals_test.kcfg) -gen_kcfg_test_source(signals_test_no_singleton_dpointer kconfigcompiler_test_signals_SRCS KCFG signals_test.kcfg) +gen_kcfg_test_source(signals_test_singleton kconfigcompiler_test_signals_SRCS GENERATE_MOC) +gen_kcfg_test_source(signals_test_no_singleton kconfigcompiler_test_signals_SRCS GENERATE_MOC) +gen_kcfg_test_source(signals_test_singleton_dpointer kconfigcompiler_test_signals_SRCS GENERATE_MOC) +gen_kcfg_test_source(signals_test_no_singleton_dpointer kconfigcompiler_test_signals_SRCS GENERATE_MOC) ecm_add_test(${kconfigcompiler_test_signals_SRCS} TEST_NAME kconfigcompiler-signals-test @@ -236,7 +220,7 @@ ########### next target ############### set(test_translation_qt_SRCS test_translation_qt_main.cpp) -gen_kcfg_test_source(test_translation_qt test_translation_qt_SRCS KCFG test_translation.kcfg) +gen_kcfg_test_source(test_translation_qt test_translation_qt_SRCS) ecm_add_test(TEST_NAME test_translation_qt ${test_translation_qt_SRCS}) target_link_libraries(test_translation_qt KF5::ConfigGui) @@ -244,7 +228,7 @@ ########### next target ############### set(test_translation_kde_SRCS test_translation_kde_main.cpp) -gen_kcfg_test_source(test_translation_kde test_translation_kde_SRCS KCFG test_translation.kcfg) +gen_kcfg_test_source(test_translation_kde test_translation_kde_SRCS) ecm_add_test(TEST_NAME test_translation_kde ${test_translation_kde_SRCS}) target_link_libraries(test_translation_kde KF5::ConfigGui) @@ -252,8 +236,7 @@ ########### next target ############### set(test_translation_kde_domain_SRCS test_translation_kde_domain_main.cpp) -gen_kcfg_test_source(test_translation_kde_domain test_translation_kde_domain_SRCS KCFG test_translation.kcfg) +gen_kcfg_test_source(test_translation_kde_domain test_translation_kde_domain_SRCS) ecm_add_test(TEST_NAME test_translation_kde_domain ${test_translation_kde_domain_SRCS}) target_link_libraries(test_translation_kde_domain KF5::ConfigGui) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/autotests/kconfig_compiler/test1.kcfgc new/kconfig-5.28.0/autotests/kconfig_compiler/test1.kcfgc --- old/kconfig-5.27.0/autotests/kconfig_compiler/test1.kcfgc 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/autotests/kconfig_compiler/test1.kcfgc 2016-11-07 13:18:27.000000000 +0100 @@ -1,5 +1,6 @@ # Code generation options for kconfig_compiler_kf5 ClassName=Test1 +File=test1.kcfg # # Singleton=false # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/autotests/kconfig_compiler/test12.kcfgc new/kconfig-5.28.0/autotests/kconfig_compiler/test12.kcfgc --- old/kconfig-5.27.0/autotests/kconfig_compiler/test12.kcfgc 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/autotests/kconfig_compiler/test12.kcfgc 2016-11-07 13:18:27.000000000 +0100 @@ -1 +1,2 @@ ClassName=Test12 +File=test12.kcfg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/autotests/kconfig_compiler/test13.kcfgc new/kconfig-5.28.0/autotests/kconfig_compiler/test13.kcfgc --- old/kconfig-5.27.0/autotests/kconfig_compiler/test13.kcfgc 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/autotests/kconfig_compiler/test13.kcfgc 2016-11-07 13:18:27.000000000 +0100 @@ -1,3 +1,4 @@ ClassName=Test13 GenerateProperties=true Mutators=brightness +File=test13.kcfg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/autotests/kconfig_compiler/test9.kcfgc new/kconfig-5.28.0/autotests/kconfig_compiler/test9.kcfgc --- old/kconfig-5.27.0/autotests/kconfig_compiler/test9.kcfgc 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/autotests/kconfig_compiler/test9.kcfgc 2016-11-07 13:18:27.000000000 +0100 @@ -1,5 +1,6 @@ # Code generation options for kconfig_compiler_kf5 ClassName=Test9 +File=test9.kcfg # # Singleton=false # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/autotests/kconfig_compiler/test_qdebugcategory.kcfgc new/kconfig-5.28.0/autotests/kconfig_compiler/test_qdebugcategory.kcfgc --- old/kconfig-5.27.0/autotests/kconfig_compiler/test_qdebugcategory.kcfgc 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/autotests/kconfig_compiler/test_qdebugcategory.kcfgc 2016-11-07 13:18:27.000000000 +0100 @@ -1,5 +1,5 @@ # Code generation options for kconfig_compiler_kf5 -File=test_qdebugcategory.kcfgc +File=test_qdebugcategory.kcfg ClassName=TestQCategory Singleton=false Mutators=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/po/fi/kconfig5_qt.po new/kconfig-5.28.0/po/fi/kconfig5_qt.po --- old/kconfig-5.27.0/po/fi/kconfig5_qt.po 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/po/fi/kconfig5_qt.po 2016-11-07 13:18:27.000000000 +0100 @@ -1,10 +1,10 @@ -# Lasse Liehu <lasse.li...@gmail.com>, 2014, 2015. +# Lasse Liehu <lasse.li...@gmail.com>, 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2015-08-08 16:21+0200\n" +"PO-Revision-Date: 2016-10-15 23:09+0200\n" "Last-Translator: Lasse Liehu <lasse.li...@gmail.com>\n" "Language-Team: Finnish <kde-i18n-...@kde.org>\n" "Language: fi\n" @@ -425,22 +425,22 @@ #: gui/kstandardshortcut.cpp:167 msgctxt "KStandardShortcut|@action" msgid "Delete File" -msgstr "" +msgstr "Poista tiedosto" #: gui/kstandardshortcut.cpp:168 msgctxt "KStandardShortcut|@action" msgid "Rename File" -msgstr "" +msgstr "Muuta tiedoston nimeä" #: gui/kstandardshortcut.cpp:169 msgctxt "KStandardShortcut|@action" msgid "Move to Trash" -msgstr "" +msgstr "Siirrä roskakoriin" #: gui/kstandardshortcut.cpp:170 msgctxt "KStandardShortcut|@action" msgid "Donate" -msgstr "" +msgstr "Lahjoita" #: kconf_update/kconf_update.cpp:953 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/po/ko/kconfig5_qt.po new/kconfig-5.28.0/po/ko/kconfig5_qt.po --- old/kconfig-5.27.0/po/ko/kconfig5_qt.po 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/po/ko/kconfig5_qt.po 2016-11-07 13:18:27.000000000 +0100 @@ -1,15 +1,15 @@ # Translation of kwriteconfig to Korean. # Copyright (C) 2007 This_file_is_part_of_KDE # This file is distributed under the same license as the 2007 package. -# Shinjo Park <k...@peremen.name>, 2007, 2014, 2015. +# Shinjo Park <k...@peremen.name>, 2007, 2014, 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2015-11-07 00:28+0100\n" -"Last-Translator: Shinjo Park <pere...@gmail.com>\n" +"PO-Revision-Date: 2016-10-20 23:13+0100\n" +"Last-Translator: Shinjo Park <k...@peremen.name>\n" "Language-Team: Korean <k...@peremen.name>\n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -429,22 +429,22 @@ #: gui/kstandardshortcut.cpp:167 msgctxt "KStandardShortcut|@action" msgid "Delete File" -msgstr "" +msgstr "파일 삭제" #: gui/kstandardshortcut.cpp:168 msgctxt "KStandardShortcut|@action" msgid "Rename File" -msgstr "" +msgstr "파일 이름 바꾸기" #: gui/kstandardshortcut.cpp:169 msgctxt "KStandardShortcut|@action" msgid "Move to Trash" -msgstr "" +msgstr "휴지통으로 이동" #: gui/kstandardshortcut.cpp:170 msgctxt "KStandardShortcut|@action" msgid "Donate" -msgstr "" +msgstr "기부하기" #: kconf_update/kconf_update.cpp:953 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/po/nn/kconfig5_qt.po new/kconfig-5.28.0/po/nn/kconfig5_qt.po --- old/kconfig-5.27.0/po/nn/kconfig5_qt.po 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/po/nn/kconfig5_qt.po 2016-11-07 13:18:27.000000000 +0100 @@ -1,14 +1,14 @@ # Translation of kconfig5_qt to Norwegian Nynorsk # # Håvard Korsvoll <korsv...@skulelinux.no>, 2004. -# Karl Ove Hufthammer <k...@huftis.org>, 2007, 2008, 2015. +# Karl Ove Hufthammer <k...@huftis.org>, 2007, 2008, 2015, 2016. # Eirik U. Birkeland <eir...@gmail.com>, 2008. msgid "" msgstr "" "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2015-09-12 19:07+0100\n" +"PO-Revision-Date: 2016-10-13 22:35+0100\n" "Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n" "Language-Team: Norwegian Nynorsk <i18n...@lister.ping.uio.no>\n" "Language: nn\n" @@ -432,22 +432,22 @@ #: gui/kstandardshortcut.cpp:167 msgctxt "KStandardShortcut|@action" msgid "Delete File" -msgstr "" +msgstr "Slett fil" #: gui/kstandardshortcut.cpp:168 msgctxt "KStandardShortcut|@action" msgid "Rename File" -msgstr "" +msgstr "Endra namn på fil" #: gui/kstandardshortcut.cpp:169 msgctxt "KStandardShortcut|@action" msgid "Move to Trash" -msgstr "" +msgstr "Flytt til papirkorga" #: gui/kstandardshortcut.cpp:170 msgctxt "KStandardShortcut|@action" msgid "Donate" -msgstr "" +msgstr "Gje pengegåve" #: kconf_update/kconf_update.cpp:953 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/po/zh_CN/kconfig5_qt.po new/kconfig-5.28.0/po/zh_CN/kconfig5_qt.po --- old/kconfig-5.27.0/po/zh_CN/kconfig5_qt.po 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/po/zh_CN/kconfig5_qt.po 2016-11-07 13:18:27.000000000 +0100 @@ -8,9 +8,9 @@ "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2016-01-18 22:03-0800\n" +"PO-Revision-Date: 2016-10-09 20:44-0800\n" "Last-Translator: Weng Xuetian <wen...@gmail.com>\n" -"Language-Team: Chinese <kde-i18n-...@kde.org>\n" +"Language-Team: Chinese <kde-ch...@kde.org>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -429,22 +429,22 @@ #: gui/kstandardshortcut.cpp:167 msgctxt "KStandardShortcut|@action" msgid "Delete File" -msgstr "" +msgstr "删除文件" #: gui/kstandardshortcut.cpp:168 msgctxt "KStandardShortcut|@action" msgid "Rename File" -msgstr "" +msgstr "重命名文件" #: gui/kstandardshortcut.cpp:169 msgctxt "KStandardShortcut|@action" msgid "Move to Trash" -msgstr "" +msgstr "移至回收站" #: gui/kstandardshortcut.cpp:170 msgctxt "KStandardShortcut|@action" msgid "Donate" -msgstr "" +msgstr "捐助" #: kconf_update/kconf_update.cpp:953 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.27.0/src/kconfig_compiler/README.dox new/kconfig-5.28.0/src/kconfig_compiler/README.dox --- old/kconfig-5.27.0/src/kconfig_compiler/README.dox 2016-10-02 11:46:02.000000000 +0200 +++ new/kconfig-5.28.0/src/kconfig_compiler/README.dox 2016-11-07 13:18:27.000000000 +0100 @@ -206,6 +206,15 @@ <td>bool</td> <td>false</td> <td>If set to true, forces the first parameter of the generated class to be a QString when using an argument for the filename. This is useful to specify at runtime the filename of the configuration class.</td> +</tr> +<tr> + <td><b>GenerateProperties</b></td> + <td>bool</td> + <td>false</td> + <td>If set to true, a Q_PROPERTY will be generated for each member variable holding a configuration value + and the Q_OBJECT macro will be added to the generated class. + Note that you will also need to pass the GENERATE_MOC option to the kconfig_add_kcfg_files macro.</td> +</tr> </table>
