| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
|
| |
| |
| |
| |
| | |
Merge-request: 440
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |
|
| |
| |
| |
| |
| |
| | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tools/assistant/lib/qhelpsearchquerywidget.cpp
|
| |
| |
| |
| | |
make qmake generate proper dependencies on lrelease in vcproj/sln files
|
| |
| |
| |
| | |
Reviewed-by: Daniel Molkentin
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |/ |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/global/qglobal.h
src/gui/dialogs/qfiledialog_win.cpp
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/modules.qdoc
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/webkit/fancybrowser/mainwindow.cpp
src/gui/widgets/qtabbar.cpp
src/gui/widgets/qtabbar_p.h
tests/auto/qpixmap/tst_qpixmap.cpp
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/tabbedbrowser.cpp
translations/translations.pri
|
| |
| |
| |
| | |
Reviewed-by: Pierre Rossi
|
| |
| |
| |
| |
| |
| |
| | |
Also took care of placing non breakable spaces before double
punctuation characters.
Reviewed-by: Benjamin Poulain
|
| |
| |
| |
| |
| |
| |
| | |
Also put non breakable spaces in front of characters such as ':', '!'
and '?'
Reviewed-by: Pierre Rossi
|
| |\ |
|
| | | |
|
| | | |
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
this is mostly a revert of the revert of the previous attempt, only that
this time we have a bootstrapped lrelease which won't blow up for
cross-compilations.
Reviewed-By: Jason McDonald
Task-Id: QTBUG-4939
|
|\ \ \
| | |/
| |/| |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add the new translations for the string added by
500e71ab649a5053667ff3f9dc7d87730b565756
Update some translations
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/styles/qcommonstyle.cpp
tools/assistant/lib/lib.pro
tools/assistant/lib/qhelp_global.cpp
tools/assistant/tools/assistant/assistant.qch
tools/assistant/tools/assistant/mainwindow.cpp
|
| |/ |
|
| |\ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Pierre Rossi
|
| | | |
|
| |/
| |
| |
| |
| | |
Merge-request: 1977
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/ |
|
| | |
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
translations/assistant_adp_pl.ts
translations/assistant_adp_ru.ts
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
Merge-request: 1761
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Help library
Merge-request: 1761
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 1761
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 1761
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 1761
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tools/assistant/translations/translations_adp.pro
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/itemviews/qheaderview.cpp
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|