code moved from QskControl to QskQuick

src/controls/QskControl.cpp

@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "QskControl.h"
+#include "QskQuick.h"
 #include "QskAspect.h"
 #include "QskSetup.h"
 #include "QskSkinlet.h"

src/controls/QskControl.h

@@ -249,27 +249,6 @@ inline QSizeF QskControl::sizeHint() const
     return effectiveConstraint( Qt::PreferredSize );
 }
 
-QSK_EXPORT bool qskIsItemComplete( const QQuickItem* item );
-QSK_EXPORT bool qskIsAncestorOf( const QQuickItem* item, const QQuickItem* child );
-QSK_EXPORT bool qskIsTransparentForPositioner( const QQuickItem* );
-QSK_EXPORT bool qskIsTabFence( const QQuickItem* );
-QSK_EXPORT bool qskIsShortcutScope( const QQuickItem* );
-
-QSK_EXPORT QRectF qskItemRect( const QQuickItem* );
-QSK_EXPORT QRectF qskItemGeometry( const QQuickItem* );
-QSK_EXPORT void qskSetItemGeometry( QQuickItem*, const QRectF& );
-
-QSK_EXPORT QQuickItem* qskNearestFocusScope( const QQuickItem* );
-QSK_EXPORT void qskForceActiveFocus( QQuickItem*, Qt::FocusReason );
-
-QSK_EXPORT QList< QQuickItem* > qskPaintOrderChildItems( const QQuickItem* );
-
-QSK_EXPORT void qskUpdateInputMethod( const QQuickItem*, Qt::InputMethodQueries );
-QSK_EXPORT QQuickItem* qskInputContextItem();
-
-QSK_EXPORT const QSGNode* qskItemNode( const QQuickItem* );
-QSK_EXPORT const QSGNode* qskPaintNode( const QQuickItem* );
-
 Q_DECLARE_OPERATORS_FOR_FLAGS( QskControl::Flags )
 Q_DECLARE_METATYPE( QskControl::Flags )
 

src/controls/QskFocusIndicator.cpp

@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "QskFocusIndicator.h"
+#include "QskQuick.h"
 #include "QskBoxNode.h"
 #include "QskAspect.h"
 #include "QskEvent.h"

src/controls/QskPopup.cpp

@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "QskPopup.h"
+#include "QskQuick.h"
 #include "QskAspect.h"
 #include <QQuickWindow>
 #include <QtMath>

src/controls/QskScrollArea.cpp

@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "QskScrollArea.h"
+#include "QskQuick.h"
 #include "QskScrollViewSkinlet.h"
 #include "QskLayoutConstraint.h"
 #include "QskEvent.h"

src/controls/QskScrollViewSkinlet.cpp

@@ -5,6 +5,7 @@
 
 #include "QskScrollViewSkinlet.h"
 #include "QskScrollView.h"
+#include "QskQuick.h"
 #include "QskAspect.h"
 #include "QskFunctions.h"
 

src/controls/QskShortcutMap.cpp

@@ -5,6 +5,7 @@
 
 #include "QskShortcutMap.h"
 #include "QskControl.h"
+#include "QskQuick.h"
 #include "QskMetaInvokable.h"
 
 #include <QQuickWindow>

src/controls/QskSubWindow.cpp

@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "QskSubWindow.h"
+#include "QskQuick.h"
 #include "QskAspect.h"
 #include "QskSkin.h"
 #include "QskFunctions.h"

src/controls/QskTextInput.cpp

@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "QskTextInput.h"
+#include "QskQuick.h"
 
 // VS2012+ disable keyword macroizing unless _ALLOW_KEYWORD_MACROS is set
 #ifdef _MSC_VER

src/controls/QskWindow.cpp

@@ -5,6 +5,7 @@
 
 #include "QskWindow.h"
 #include "QskControl.h"
+#include "QskQuick.h"
 #include "QskAspect.h"
 #include "QskSetup.h"
 #include "QskSkin.h"

src/inputpanel/QskInputContext.cpp

@@ -9,11 +9,12 @@
 #include "QskInputPanel.h"
 #include "QskInputEngine.h"
 
-#include <QskLinearBox.h>
+#include "QskLinearBox.h"
-#include <QskDialog.h>
+#include "QskDialog.h"
-#include <QskPopup.h>
+#include "QskPopup.h"
-#include <QskWindow.h>
+#include "QskWindow.h"
-#include <QskEvent.h>
+#include "QskEvent.h"
+#include "QskQuick.h"
 
 #include <QPointer>
 #include <QGuiApplication>

src/layouts/QskIndexedLayoutBox.cpp

@@ -4,8 +4,10 @@
  *****************************************************************************/
 
 #include "QskIndexedLayoutBox.h"
+#include "QskQuick.h"
 #include "QskLayoutEngine.h"
 #include "QskLayoutItem.h"
+
 #include <limits>
 
 class QskIndexedLayoutBox::PrivateData

src/layouts/QskLayoutItem.cpp

@@ -5,10 +5,9 @@
 
 #include "QskLayoutItem.h"
 #include "QskControl.h"
+#include "QskQuick.h"
 #include "QskLayoutConstraint.h"
 
-#include <QQuickItem>
-
 QskLayoutItem::QskLayoutItem( QQuickItem* item,
         int row, int column, int rowSpan, int columnSpan ):
     Inherited( row, column, qMax( rowSpan, 1 ), qMax( columnSpan, 1 ), Qt::Alignment() ),

support/SkinnyShortcut.cpp

@@ -7,6 +7,7 @@
 #include <QskAspect.h>
 #include <QskSkin.h>
 #include <QskControl.h>
+#include <QskQuick.h>
 #include <QskSkinTransition.h>
 
 #include <QQuickItem>