diff options
-rw-r--r-- | src/corelib/global/qlogging.cpp | 4 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimetype.cpp | 6 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimetype_p.h | 2 | ||||
-rw-r--r-- | src/corelib/statemachine/qeventtransition_p.h | 2 | ||||
-rw-r--r-- | src/corelib/statemachine/qstate_p.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index d9d21c535c..447a875655 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -972,8 +972,8 @@ struct QMessagePattern { QElapsedTimer timer; #endif #ifdef QLOGGING_HAVE_BACKTRACE - int backtraceDepth; QString backtraceSeparator; + int backtraceDepth; #endif bool fromEnvironment; @@ -986,8 +986,8 @@ QMessagePattern::QMessagePattern() : literals(0) , tokens(0) #ifdef QLOGGING_HAVE_BACKTRACE - , backtraceDepth(5) , backtraceSeparator(QLatin1Char('|')) + , backtraceDepth(5) #endif , fromEnvironment(false) { diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index 70df9868b6..a5f9cb70d5 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -53,12 +53,12 @@ QMimeTypePrivate::QMimeTypePrivate() {} QMimeTypePrivate::QMimeTypePrivate(const QMimeType &other) - : name(other.d->name), + : loaded(other.d->loaded), + name(other.d->name), localeComments(other.d->localeComments), genericIconName(other.d->genericIconName), iconName(other.d->iconName), - globPatterns(other.d->globPatterns), - loaded(other.d->loaded) + globPatterns(other.d->globPatterns) {} void QMimeTypePrivate::clear() diff --git a/src/corelib/mimetypes/qmimetype_p.h b/src/corelib/mimetypes/qmimetype_p.h index bf533bbcb0..2161dd8901 100644 --- a/src/corelib/mimetypes/qmimetype_p.h +++ b/src/corelib/mimetypes/qmimetype_p.h @@ -66,12 +66,12 @@ public: void addGlobPattern(const QString &pattern); + bool loaded; // QSharedData leaves a 4 byte gap, so don't put 8 byte members first QString name; LocaleHash localeComments; QString genericIconName; QString iconName; QStringList globPatterns; - bool loaded; }; QT_END_NAMESPACE diff --git a/src/corelib/statemachine/qeventtransition_p.h b/src/corelib/statemachine/qeventtransition_p.h index 64ab945187..59b0fcb30f 100644 --- a/src/corelib/statemachine/qeventtransition_p.h +++ b/src/corelib/statemachine/qeventtransition_p.h @@ -61,8 +61,8 @@ public: void unregister(); void maybeRegister(); - bool registered; QObject *object; + bool registered; QEvent::Type eventType; }; diff --git a/src/corelib/statemachine/qstate_p.h b/src/corelib/statemachine/qstate_p.h index 28bb176b56..2ce0c13522 100644 --- a/src/corelib/statemachine/qstate_p.h +++ b/src/corelib/statemachine/qstate_p.h @@ -103,8 +103,8 @@ public: QAbstractState *initialState; QState::ChildMode childMode; mutable bool childStatesListNeedsRefresh; - mutable QList<QAbstractState*> childStatesList; mutable bool transitionsListNeedsRefresh; + mutable QList<QAbstractState*> childStatesList; mutable QList<QAbstractTransition*> transitionsList; #ifndef QT_NO_PROPERTIES |