When the time comes to merge dev into master (for real), the
following may be useful:
https://metlos.wordpress.com/2012/01/13/
git-merging-after-a-revert/

update repository.

Removed Linux-specific define (didn't work; the function wasn't defined when compiling on Linux, for some reason)

Q_WS_MACX -> Q_OS_OSX
Q_WS_MAC -> Q_OS_OSX
Q_WS_WIN -> Q_OS_WIN
Q_WS_X11 -> Q_OS_LINUX

Added loadAcquire() to get int value of QAtomicInt variables. (Was previously done automatically with the operatorint() of QAtomicInt)

added 'supportedDragActions' function to replace functionality provided by 'setSupportedDragActions' function (obsolete)

Removed deprecated QPlastiqueStyle. Replaced by stock Fusion style (new in Qt5). Change this to keep the custom look defined in UBStyle?

Merge branch 'SEM-WithoutDocumentMode' of 62.2.114.190:/home/git/git/OpenBoardPrivate into SEM-WithoutDocumentMode