mostly headers compat

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

CMakeLists.txt

@@ -675,7 +675,6 @@ katie_generate_obsolete(qxmlstreamnamespacedeclaration.h QtCore qxmlstream.h)
 katie_generate_obsolete(qmultimap.h QtCore qmap.h)
 katie_generate_obsolete(qxmlstreamnotationdeclaration.h QtCore qxmlstream.h)
 katie_generate_obsolete(qshareddatapointer.h QtCore qshareddata.h)
-katie_generate_obsolete(qlatin1literal.h QtCore qstringbuilder.h)
 katie_generate_obsolete(qxmlstreamattribute.h QtCore qxmlstream.h)
 katie_generate_obsolete(qchildevent.h QtCore qcoreevent.h)
 katie_generate_obsolete(qfileinfolist.h QtCore qfileinfo.h)

scripts/incfsck.py

@@ -162,6 +162,8 @@ incmap = {
         'QStyleOptionTabV2': 'qstyleoption.h',
         'QStyleOptionTabV3': 'qstyleoption.h',
         'QStyleOptionTabBarBase': 'qstyleoption.h',
+        'QStyleOptionTabWidgetFrame': 'qstyleoption.h',
+        'QStyleOptionTabWidgetFrameV2': 'qstyleoption.h',
         'QTextListFormat': 'qtextformat.h',
         'QGradient': 'qbrush.h',
         'QFontMetricsF': 'qfontmetrics.h',

src/gui/CMakeLists.txt

@@ -343,6 +343,7 @@ set(GUI_PUBLIC_HEADERS
     QListWidgetItem
     QTreeWidgetItem
     QStandardItem
+    QActionEvent
     QShortcutEvent
     QCloseEvent
     QResizeEvent
@@ -373,6 +374,7 @@ set(GUI_PUBLIC_HEADERS
     QGraphicsSceneDragDropEvent
     QGraphicsTextItem
     QGraphicsObject
+    QStyleOptionTitleBar
     QStyleOptionGraphicsItem
     QStyleOptionButton
     QStyleOptionFrame

src/gui/kernel/qwidgetaction.cpp

@@ -86,22 +86,6 @@ QT_BEGIN_NAMESPACE
     Note that it is up to the widget to activate the action, for example by
     reimplementing mouse event handlers and calling QAction::trigger().
 
-    \bold {Mac OS X}: If you add a widget to a menu in the application's menu
-    bar on Mac OS X, the widget will be added and it will function but with some
-    limitations:
-    \list 1
-        \o The widget is reparented away from the QMenu to the native menu
-            view. If you show the menu in some other place (e.g. as a popup menu),
-            the widget will not be there.
-        \o Focus/Keyboard handling of the widget is not possible.
-        \o Due to Apple's design, mouse tracking on the widget currently does
-            not work.
-        \o Connecting the triggered() signal to a slot that opens a modal
-            dialog will cause a crash in Mac OS X 10.4 (known bug acknowledged
-            by Apple), a workaround is to use a QueuedConnection instead of a
-            DirectConnection.
-    \endlist
-
     \sa QAction, QActionGroup, QWidget
 */
 

src/gui/kernel/qwidgetaction.h

@@ -67,7 +67,7 @@ public:
 
     QWidget *requestWidget(QWidget *parent);
     void releaseWidget(QWidget *widget);
-    
+
 protected:
     virtual bool event(QEvent *);
     virtual bool eventFilter(QObject *, QEvent *);

src/gui/kernel/qx11embed_x11.h

@@ -61,9 +61,9 @@ public:
     WId containerWinId() const;
 
     enum Error {
-	Unknown,
-	Internal,
-	InvalidWindowID
+        Unknown,
+        Internal,
+        InvalidWindowID
     };
     Error error() const;
 
@@ -99,9 +99,9 @@ public:
     QSize minimumSizeHint() const;
 
     enum Error {
-	Unknown,
-	Internal,
-	InvalidWindowID
+        Unknown,
+        Internal,
+        InvalidWindowID
     };
     Error error() const;