diff --git a/playground/anchors/kiwi/Solver.cpp b/playground/anchors/kiwi/Solver.cpp index a0a6a9b5..9db163b9 100644 --- a/playground/anchors/kiwi/Solver.cpp +++ b/playground/anchors/kiwi/Solver.cpp @@ -79,8 +79,8 @@ class FlatMap inline typename std::vector< T >::iterator lowerBound( const Key& key ) const { - auto cmp = []( const T& entry, const Key& key ) - { return entry.key() < key; }; + auto cmp = []( const T& entry, const Key& k ) + { return entry.key() < k; }; auto& entries = const_cast< std::vector< T >& >( m_entries ); return std::lower_bound( entries.begin(), entries.end(), key, cmp ); diff --git a/src/common/QskFunctions.cpp b/src/common/QskFunctions.cpp index 986daa2a..62adce3c 100644 --- a/src/common/QskFunctions.cpp +++ b/src/common/QskFunctions.cpp @@ -234,7 +234,8 @@ float qskConstrainedRadians( float radians ) return radians; } -// do not export; +QSK_HIDDEN_EXTERNAL_BEGIN + bool qskHasEnvironment( const char* env ) { bool ok; @@ -247,3 +248,5 @@ bool qskHasEnvironment( const char* env ) auto result = qgetenv( env ); return !result.isEmpty() && result != "false"; } + +QSK_HIDDEN_EXTERNAL_END diff --git a/src/common/QskGlobal.h b/src/common/QskGlobal.h index 408d6e2b..de6dcd40 100644 --- a/src/common/QskGlobal.h +++ b/src/common/QskGlobal.h @@ -43,6 +43,13 @@ #define QSK_QT_PRIVATE_END \ QT_WARNING_POP +#define QSK_HIDDEN_EXTERNAL_BEGIN \ + QT_WARNING_PUSH \ + QT_WARNING_DISABLE_GCC("-Wmissing-declarations") + +#define QSK_HIDDEN_EXTERNAL_END \ + QT_WARNING_POP + #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) using QskHashValue = uint; #else diff --git a/src/controls/QskControlPrivate.cpp b/src/controls/QskControlPrivate.cpp index d8f402ba..9713fa1b 100644 --- a/src/controls/QskControlPrivate.cpp +++ b/src/controls/QskControlPrivate.cpp @@ -84,6 +84,8 @@ namespace }; } +QSK_HIDDEN_EXTERNAL_BEGIN + QLocale qskInheritedLocale( const QObject* object ) { VisitorLocale visitor; @@ -101,6 +103,16 @@ void qskInheritLocale( QObject* object, const QLocale& locale ) QskObjectTree::traverseDown( object, visitor ); } +void qskInheritSection( QskControl* control, QskAspect::Section section ) +{ + VisitorSection visitor; + visitor.setResolveValue( section ); + + QskObjectTree::traverseDown( control, visitor ); +} + +QSK_HIDDEN_EXTERNAL_END + static QskAspect::Section qskInheritedSection( const QskControl* control ) { VisitorSection visitor; @@ -110,14 +122,6 @@ static QskAspect::Section qskInheritedSection( const QskControl* control ) return visitor.resolveValue(); } -void qskInheritSection( QskControl* control, QskAspect::Section section ) -{ - VisitorSection visitor; - visitor.setResolveValue( section ); - - QskObjectTree::traverseDown( control, visitor ); -} - /* Qt 5.12: sizeof( QQuickItemPrivate::ExtraData ) -> 184 diff --git a/src/controls/QskItem.cpp b/src/controls/QskItem.cpp index e77cea62..fa2add84 100644 --- a/src/controls/QskItem.cpp +++ b/src/controls/QskItem.cpp @@ -1136,10 +1136,14 @@ QSGNode* QskItem::updateItemPaintNode( QSGNode* node ) return node; } +QSK_HIDDEN_EXTERNAL_BEGIN + void qskUpdateItemFlags() { if ( qskRegistry ) qskRegistry->updateItemFlags(); } +QSK_HIDDEN_EXTERNAL_END + #include "moc_QskItem.cpp" diff --git a/src/controls/QskItemAnchors.cpp b/src/controls/QskItemAnchors.cpp index 580dc191..796dfc45 100644 --- a/src/controls/QskItemAnchors.cpp +++ b/src/controls/QskItemAnchors.cpp @@ -257,12 +257,12 @@ void QskItemAnchors::addAnchors( Qt::Corner corner, QQuickItem* settledItem, Qt::Corner settledItemCorner ) { auto anchorPoint = - []( Qt::Corner corner, Qt::Orientation orientation ) + []( Qt::Corner cn, Qt::Orientation orientation ) { if ( orientation == Qt::Horizontal ) - return ( corner & 0x1 ) ? Qt::AnchorRight : Qt::AnchorLeft; + return ( cn & 0x1 ) ? Qt::AnchorRight : Qt::AnchorLeft; else - return ( corner >= 0x2 ) ? Qt::AnchorBottom : Qt::AnchorTop; + return ( cn >= 0x2 ) ? Qt::AnchorBottom : Qt::AnchorTop; }; addAnchor( anchorPoint( corner, Qt::Horizontal ), diff --git a/src/controls/QskSkin.cpp b/src/controls/QskSkin.cpp index ce464470..c73ea2ce 100644 --- a/src/controls/QskSkin.cpp +++ b/src/controls/QskSkin.cpp @@ -126,6 +126,8 @@ static inline QskSkinlet* qskNewSkinlet( const QMetaObject* metaObject, QskSkin* // also used in QskSkinTransition.cpp TODO ... +QSK_HIDDEN_EXTERNAL_BEGIN + QFont qskResolvedFont( const QHash< QskFontRole, QFont >& fontTable, const QskFontRole& fontRole ) { @@ -140,6 +142,8 @@ QFont qskResolvedFont( const QHash< QskFontRole, QFont >& fontTable, return QGuiApplication::font(); } +QSK_HIDDEN_EXTERNAL_END + namespace { class SkinletData diff --git a/src/controls/QskWindow.cpp b/src/controls/QskWindow.cpp index 5d520db7..b811a38e 100644 --- a/src/controls/QskWindow.cpp +++ b/src/controls/QskWindow.cpp @@ -482,6 +482,8 @@ void QskWindow::resetLocale() qskResolveLocale( this ); } +QSK_HIDDEN_EXTERNAL_BEGIN + bool qskInheritLocale( QskWindow* window, const QLocale& locale ) { auto d = static_cast< QskWindowPrivate* >( QQuickWindowPrivate::get( window ) ); @@ -495,6 +497,8 @@ bool qskInheritLocale( QskWindow* window, const QLocale& locale ) return true; } +QSK_HIDDEN_EXTERNAL_END + static void qskResolveLocale( QskWindow* window ) { auto d = static_cast< QskWindowPrivate* >( QQuickWindowPrivate::get( window ) );