Skip to content

Fix windows Build: activate QT initializer lists #1019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 28, 2016
Merged

Fix windows Build: activate QT initializer lists #1019

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51fe513
Fix windows Build: activate QT initializer lists
sblaisot Sep 28, 2016
e0da068
restrict initializer lists fix to MSVC 2012 SP2+
sblaisot Sep 28, 2016
8365bc9
windows build fix: extend workaround to MSVS 2013 SP2 with CTP_Nov201…
sblaisot Sep 28, 2016
82c73d9
Windows build fix: fix comment typo
sblaisot Sep 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/track/keyutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
// Horrible Hack to workaround QT 4.8 bug with MSVC compiler. lp:1627826
// QT 4.8 explicitely disable Initializer lists, but initializer lists is
// supported with MSVC 2013 SP2 +
// http://code.qt.io/cgit/qt/qt.git/tree/src/corelib/global/qglobal.h#n910
// TODO(XXX): Remove after QT4 deprecation, unneeded with QT5
#if _MSC_VER >= 1800 /* MSVS 2013 */
#define Q_COMPILER_INITIALIZER_LISTS
#endif /* MSVS 2013 */
#include <QtDebug>
#include <QMap>
#include <QMutexLocker>
Expand Down