| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
it is pretty pointless, really. these are manual targets, so if they
fail because of missing tools, the user can just make sub-tools
manually. way better than wasting time waiting for make to run through
the whole qt tree each time.
|
|
|
|
|
|
| |
it is pretty pointless to commit the extracted line number information,
as it needs to be refreshed after pulling source code changes anyway. on
top of it, it bloats the repository.
|
|
|
|
|
| |
these files are not meant for commit, but it's good to have a quick way
to create templates.
|
|
|
|
|
|
|
|
|
| |
there are now per-language ts-<package>-<lang> and ts-<lang> targets to
update only the files relevant for a given language.
there is also a ts-all target which does what the old ts target did.
the ts-<package> targets are now named ts-<package>-all and should not
be used manually - they exist for the convenience of the ts-all target.
the ts target is now only a help blurb.
|
|
|
|
| |
the combined target would be too hard to transform in the next commit
|
|
|
|
|
|
| |
lupdate is now powerful enough to use the real project files.
this avoids that the file lists run out of sync (which they did, though
not as much as i expected).
|
| |
|
|
|
|
|
| |
the other _ja files have no country qualification either, and it makes
no sense anyway.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
the function provides a cross-platform way to determine the exact
pathname of our build tools (moc, etc.).
use it in our .prf files, so we don't have to rely on qmake's
unreliable path separator normalization magic in extra compiler
commands, which broke on mingw+sh in silent mode.
remove the bootstrap tool path setting from configure, as it is
redundant now.
Reviewed-by: joerg
Task-number: QTBUG-10633
|
|\ \
| |/
| |
| |
| | |
Conflicts:
translations/translations.pri
|
| |
| |
| |
| |
| | |
iw comes from the obsolete ISO639. we are using ISO639-1 or something
newer.
|
| | |
|
| |
| |
| |
| |
| | |
Add to translations profile. move stuff out of QObject-context,
correct spelling and contractions, correct usage of tr().
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tools/assistant/translations/translations_adp.pro
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/itemviews/qheaderview.cpp
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/io/qdatastream.h
tools/assistant/translations/translations_adp.pro
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
tools/qdoc3/test/qt.qdocconf
translations/assistant_adp_de.ts
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
with the current scheme of running "make ts" only when doing a
particular translation and checking in only the relevant file, these
files are never updated.
lconvert can generate an empty template from any translation anyway.
|
|\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
src/corelib/io/qdatastream.h
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1320
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
doc/src/qt4-intro.qdoc
|
| | | |
|
|/ / |
|
|\ \
| |/
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
|
|
|