diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2016-07-28 12:50:38 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2016-07-28 12:23:47 +0000 |
| commit | 3c9a70eec93ad3155708686b4aa8493599341a6b (patch) | |
| tree | 1045e1092ff1a935127d3aef9e6b7e7eefdcd3e0 /tests/manual/scenegraph_lancelot/scenegrabber | |
| parent | a05f59388e004160899d5d311884cfabe10c3b8c (diff) | |
MSVC: Make Lancelot's scenegrabber compile
The extern declaration needs Q_CORE_EXPORT (which resolves to an import
declaration on MSVC). Also, the type of the qt_qhash_seed variable is
a QBasicAtomicInt, not int, so with proper signature mangling it would
not resolve (since memory layout is the same for an int and
a QBasicAtomicInt, it would just work for linkers that did not
detect it.)
Change-Id: I92375afcfc13e045e78a4d6cfdd539bd01b66136
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'tests/manual/scenegraph_lancelot/scenegrabber')
| -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 d8eedd5afb..8231c7ffef 100644 --- a/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp +++ b/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp @@ -139,7 +139,7 @@ private: }; -extern uint qt_qhash_seed; +Q_CORE_EXPORT extern QBasicAtomicInt qt_qhash_seed; int main(int argc, char *argv[]) { |