Преглед на файлове

Fix XML validator if the application add new extra settings to record.

Change QtTesting tag to have the last modifications.
Benjamin Long преди 13 години
родител
ревизия
4bbe2d8590
променени са 3 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 1 1
      CMakeExternals/QtTesting.cmake
  2. 1 0
      Libs/QtTesting/Resources/XML/XMLDescription.xsd
  3. 1 1
      Libs/QtTesting/ctkXMLEventObserver.cpp

+ 1 - 1
CMakeExternals/QtTesting.cmake

@@ -23,7 +23,7 @@ if(CTK_USE_QTTESTING)
 
 
     if(NOT DEFINED QtTesting_DIR)
     if(NOT DEFINED QtTesting_DIR)
 
 
-      set(revision_tag 4d42969ab489b2e28b8c3dc43867acf0d6548516)
+      set(revision_tag ca08897251254b8f88b40c0ed9d57dfa3454a063)
       if(${proj}_REVISION_TAG)
       if(${proj}_REVISION_TAG)
         set(revision_tag ${${proj}_REVISION_TAG})
         set(revision_tag ${${proj}_REVISION_TAG})
       endif()
       endif()

+ 1 - 0
Libs/QtTesting/Resources/XML/XMLDescription.xsd

@@ -8,6 +8,7 @@
             <xsd:element name="font"/>
             <xsd:element name="font"/>
             <xsd:element name="version"/>
             <xsd:element name="version"/>
             <xsd:element name="name"/>
             <xsd:element name="name"/>
+            <xsd:element name="appsetting" minOccurs="0" maxOccurs="unbounded"/>
         </xsd:choice>
         </xsd:choice>
     </xsd:complexType>
     </xsd:complexType>
 
 

+ 1 - 1
Libs/QtTesting/ctkXMLEventObserver.cpp

@@ -82,7 +82,7 @@ void ctkXMLEventObserver::recordApplicationSettings()
     for(iter = states.begin() ; iter!=states.end() ; ++iter)
     for(iter = states.begin() ; iter!=states.end() ; ++iter)
       {
       {
       this->recordApplicationSetting(
       this->recordApplicationSetting(
-          iter.value(),
+          QString("appsetting"),
           iter.key()->metaObject()->className(),
           iter.key()->metaObject()->className(),
           iter.value(),
           iter.value(),
           iter.key()->property(iter.value().toLatin1()).toString()
           iter.key()->property(iter.value().toLatin1()).toString()