summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qhooks.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-04-30 22:06:09 -0700
committerThiago Macieira <thiago.macieira@intel.com>2016-06-10 17:56:18 +0000
commit1a161c8ede4ea8c18c1d33d97a847387ca2c770e (patch)
tree65c344d2843a1170c07e2fdeaad46d766ebc167b /src/corelib/global/qhooks.cpp
parent9466d0e63365bb5fb94f95d46ba9b1ab053f3289 (diff)
QDateTimePrivate: merge the time spec, DST status and validity flags
Storing them in a single byte is the first step towards the Short QDateTime Optimization. The bump in the "private version" by 10 is to accommodate possible changes in the Qt 5.7 branch. Change-Id: Id5480807d25e49e78b79ffff144a59420457bcf0 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/global/qhooks.cpp')
-rw-r--r--src/corelib/global/qhooks.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qhooks.cpp b/src/corelib/global/qhooks.cpp
index da401ffd78..2ec1714cd2 100644
--- a/src/corelib/global/qhooks.cpp
+++ b/src/corelib/global/qhooks.cpp
@@ -67,7 +67,7 @@ quintptr Q_CORE_EXPORT qtHookData[] = {
// The required sizes and offsets are tested in tests/auto/other/toolsupport.
// When this fails and the change was intentional, adjust the test and
// adjust this value here.
- 4
+ 14
};
Q_STATIC_ASSERT(QHooks::LastHookIndex == sizeof(qtHookData) / sizeof(qtHookData[0]));