| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
tests/auto/qpainter/tst_qpainter.cpp
translations/qt_ru.ts
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
it simply breaks too much (embedded builds in particular).
will come up with something better in master.
note however, that the .qm files do NOT return to the repository. the
release manager needs to run "make qm" before packaging, just like
Qt-from-git users who want translations do (i.e., almost nobody).
Reviewed-by: Jason McDonald
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
consequently, remove the qm files from the repository
this uses some really black magic to convince qmake to do the right
thing. this will be fixed properly in a later version.
Reviewed-by: mariusSO
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| | | |
|
| | |
|
| |
|
