diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-10-15 12:56:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-15 19:40:21 +0200 |
| commit | 275514a24a45c9cb4d563477b81b06fa73f60a92 (patch) | |
| tree | 221764d5b4f47ab8442e33931f8dae075b2f3570 /src | |
| parent | e6652d89578081a5a2f1cc22db68696c4c213421 (diff) | |
Don't use constructor function to initialize providers
It complicated static linking for no good reason.
Change-Id: I8eb1548b799128bfab9451963cb80c72239b961c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/qtquick2.cpp | 2 | ||||
| -rw-r--r-- | src/quick/qtquickglobal_p.h | 6 | ||||
| -rw-r--r-- | src/quick/util/qquickglobal.cpp | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp index e178a3ea45..5216fca355 100644 --- a/src/quick/qtquick2.cpp +++ b/src/quick/qtquick2.cpp @@ -172,6 +172,8 @@ void QQmlQtQuick2DebugStatesDelegate::resetBindingForInvalidProperty(QObject *ob void QQmlQtQuick2Module::defineModule() { + QQuick_initializeProviders(); + QQuickUtilModule::defineModule(); QQmlEnginePrivate::defineQtQuick2Module(); QQuickItemsModule::defineModule(); diff --git a/src/quick/qtquickglobal_p.h b/src/quick/qtquickglobal_p.h index 8cbd0b9782..f67a08c218 100644 --- a/src/quick/qtquickglobal_p.h +++ b/src/quick/qtquickglobal_p.h @@ -57,4 +57,10 @@ #define Q_QUICK_PRIVATE_EXPORT Q_QUICK_EXPORT +QT_BEGIN_NAMESPACE + +void QQuick_initializeProviders(); + +QT_END_NAMESPACE + #endif // QTQUICKGLOBAL_P_H diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 7d226ed0f7..152d1f34c9 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -1025,14 +1025,11 @@ static QQuickGuiProvider *getGuiProvider() return &guiProvider; } -static bool initializeProviders() +void QQuick_initializeProviders() { QQml_addValueTypeProvider(getValueTypeProvider()); QQml_setColorProvider(getColorProvider()); QQml_setGuiProvider(getGuiProvider()); - return true; } -Q_CONSTRUCTOR_FUNCTION(initializeProviders) - QT_END_NAMESPACE |