| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
RevBy: Trust me
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/boxes/glshaders.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tools/linguist/shared/cpp.cpp
translations/linguist_ja.qm
translations/qt_ru.qm
|
| | |
| |
| |
| |
| |
| | |
the "for-in" syntax is only available on 10.5+
Reviewed-by: MortenS
|
| |\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
src/gui/text/qfontengine_win.cpp
tools/linguist/shared/cpp.cpp
|
| | |
| |
| |
| |
| |
| | |
...because it was never implemented. This patch does that.
Task-number: 255377
|
| |\|
| |
| |
| |
| | |
Conflicts:
src/gui/inputmethod/qximinputcontext_x11.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We need to protect some overridden type and that is done in
qmacdefines_mac.h, so just include that. To top this off, a
function has changed that was introduced in 10.5. In order to
use it properly, we would need to do lots of version checking
and shuffling between types and it seems like more trouble that
it's worth at the moment. We may have to do that in the future,
but we'll deal with that then.
|
| | |
|
| |
|
