OSDN Git Service

headers compat werk [ci skip]
authorIvailo Monev <xakepa10@laimg.moc>
Tue, 4 Oct 2016 19:31:37 +0000 (19:31 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Tue, 4 Oct 2016 19:31:37 +0000 (19:31 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
CMakeLists.txt
scripts/incfsck.py
src/gui/CMakeLists.txt

index 5b488a6..42a9260 100644 (file)
@@ -771,6 +771,7 @@ katie_generate_obsolete(qgraphicsscenehelpevent.h QtGui qgraphicssceneevent.h)
 katie_generate_obsolete(qgraphicsobject.h QtGui qgraphicsitem.h)
 katie_generate_obsolete(qgraphicspolygonitem.h QtGui qgraphicsitem.h)
 katie_generate_obsolete(qtextcharformat.h QtGui qtextformat.h)
+katie_generate_obsolete(qtextblockformat.h QtGui qtextformat.h)
 katie_generate_obsolete(qinputevent.h QtGui qevent.h)
 katie_generate_obsolete(qkeyevent.h QtGui qevent.h)
 katie_generate_obsolete(qiconenginefactoryinterface.h QtGui qiconengineplugin.h)
index b5f76f2..7943df8 100755 (executable)
@@ -136,6 +136,7 @@ incmap = {
         'QTextLine': 'qtextlayout.h',
         'QTextFrame': 'qtextobject.h',
         'QTextCharFormat': 'qtextformat.h',
+        'QTextBlockFormat': 'qtextformat.h',
         'QUndoCommand': 'qundostack.h',
         'QTouchEvent': 'qevent.h',
         'QDropEvent': 'qevent.h',
index 1bcf31f..5c1d52a 100644 (file)
@@ -282,7 +282,6 @@ set(GUI_PUBLIC_HEADERS
     QTapAndHoldGesture
     QTapGesture
     QtEvents
-    QTextBlockFormat
     QTextBlockGroup
     QTextBlockUserData
     QTextBrowser
@@ -354,6 +353,7 @@ set(GUI_PUBLIC_HEADERS
     QX11EmbedWidget
     # mixed
     QTextBlock
+    QTextBlockFormat
     QListWidgetItem
     QTreeWidgetItem
     QStandardItem