diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 13:14:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 13:14:04 +0200 |
| commit | 6839f03051d2950e4721cbb5ee88fa7b07109588 (patch) | |
| tree | d5cdfeeb6e59953f5109ef87a1be08f69fcddf7a /tests/manual | |
| parent | cc5ead1b3c8ce79c240b70bdfcfb687fe60e50f5 (diff) | |
| parent | fe92db0a0eeed502ef851930b3404b38c4a03f4f (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
tests/auto/quick/qquickitem/tst_qquickitem.cpp
Change-Id: If261f8eea84dfa5944bb55de999d1f70aba528fd
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/scenegraph_lancelot/scenegrabber/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp b/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp index a4b1a1be70..5098d51134 100644 --- a/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp +++ b/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp @@ -134,7 +134,7 @@ private: }; -extern uint qt_qhash_seed; +Q_CORE_EXPORT extern QBasicAtomicInt qt_qhash_seed; int main(int argc, char *argv[]) { |