diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2018-09-28 09:47:00 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2018-10-01 09:45:26 +0000 |
| commit | b9ce354fb09bae11e04e1cb6b37e037a7c93b749 (patch) | |
| tree | f30bed7b8c4122df69ad7004044d5ca28e947f5d | |
| parent | dca3dd66b4b9f06403d22757f8957c3d8d57e845 (diff) | |
Fix namespaced build
It is not allowed to include files within Qt namespace.
Change-Id: I8b87cdc7093bdf0129acca263316f8ea3a037a90
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| -rw-r--r-- | src/corelib/animation/qpropertyanimation.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/qnetworksession_impl.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index 5ba2a1fa73..927f4f4810 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -312,8 +312,8 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState, } } -#include "moc_qpropertyanimation.cpp" - QT_END_NAMESPACE +#include "moc_qpropertyanimation.cpp" + #endif //QT_NO_ANIMATION diff --git a/src/plugins/bearer/qnetworksession_impl.cpp b/src/plugins/bearer/qnetworksession_impl.cpp index 847479047f..a09ae72cb5 100644 --- a/src/plugins/bearer/qnetworksession_impl.cpp +++ b/src/plugins/bearer/qnetworksession_impl.cpp @@ -82,8 +82,6 @@ Q_SIGNALS: void forcedSessionClose(const QNetworkConfiguration &config); }; -#include "qnetworksession_impl.moc" - Q_GLOBAL_STATIC(QNetworkSessionManagerPrivate, sessionManager); void QNetworkSessionPrivateImpl::syncStateWithInterface() @@ -432,3 +430,5 @@ void QNetworkSessionPrivateImpl::decrementTimeout() } QT_END_NAMESPACE + +#include "qnetworksession_impl.moc" |