code moved from QskControl to QskQuick

This commit is contained in:
Uwe Rathmann 2018-05-01 12:41:20 +02:00
parent 1ba0fd40bc
commit 02e6a65b07
14 changed files with 19 additions and 28 deletions

View File

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

View File

@ -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 )

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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() ),

View File

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