| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
configure
|
| | |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
|
| | |\ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/network/access/qnetworkrequest.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.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
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Task-number: QTBUG-4099
|
| | |_|_|_|_|_|_|_|_|/
|/| | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
it isn't such a good idea to insert rows one by one into the model.
so instead batch the "announcement" of new data.
unloading single models is still slow, but that's a corner use case, so
don't bother fixing it now, especially as it is harder to do it.
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
it wastes cpu cycles, and it started flooding the console with
irrelevant messages.
|
| | | | | | | | | | | |
|
| | |_|_|_|_|_|_|_|/
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
for one, it just added visual noise.
second, it did not respect the color scheme, which made it unusable with
light-on-dark colors.
Task-number: QTBUG-7778
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Merge-request: 440
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |_|_|_|_|_|_|/
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QString::fromUtf16() is slow - it does a BOM check and optionally byte
swapping, which is utterly pointless when converting internal data
structures which are raw utf16 in host byte order anyway. so replace
it with QString::fromRawData() (for short-lived strings) or
QString(const QChar *, int) (otherwise) if possible.
Reviewed-by: axis
Reviewed-by: mariusSO
Reviewed-by: Bill King
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
normalize the user input first
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
if the pro file for the translations lives in a sibling tree of the
actual source tree, messages from included headers wouldn't have been
collected, as they were not considered part of the project.
Task-number: QTBUG-7495
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
this has always been kind of an omission ...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
previously, the semantics of nesting projects were pretty bizarre:
the list of TS files grew ever as the subdirs were visited. the
source files otoh were cleared for every project. this meant that
some TS files were updated over and over again, each time with different
data.
this is obviously total nonsense, so there is no compatibilty to keep.
so here come the new semantics:
- each project is scanned separately. it has separate include paths and
may override the inherited CODECFORSRC.
- the messages from all sub-projects are merged
- if a sub-project has a TRANSLATIONS entry, it is "detached" from its
parent project, thus starting an own merged translator. it is also
possible to name an empty set of TS files to simply exclude the
sub-project.
- CODECFORTR can be specified in each project with TRANSLATIONS
- if TS files are specified on the command line, they override
TRANSLATIONS from the top level project and stop processing of
detached projects alltogether. if multiple top-level projects are
specified, they are all merged.
this is somewhat slower, as now includes are re-scanned per project,
while previously all sources were simply accumulated and scanned as one
project. this can be fixed retroactively if needed.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
lrelease needs only the TRANSLATIONS value anyway, so there is hardly
anything to share for real
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
really no point in doing so ...
|
| | |_|_|_|_|_|/
|/| | | | | | |
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp
|
| | |\ \ \ \ \ \ \
| | |_|_|_|_|_|/
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
of course, this will break if somebody actually pipes in windows files.
oh, well.
Suggested-by: joao
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-6072
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
92e9a48 ("eliminate Translator::replace()") eliminated the correctness
as well. whoops.
this code should be more efficient as well ...
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: TrustMe
|
| |/ / / / / / |
|
| |/ / / / /
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-6588
|
| | |_|_|/
|/| | | |
|
| | |_|/
|/| |
| | |
| | |
| | |
| | | |
Reviewed-by: Oswald Buddenhagen
modified: tools/linguist/linguist/messageeditor.h
|
| |\ \ \
| | |/
| |/| |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
after all, it is no good idea to announce the removal of all columns
just to let the view headers adjust themselves - it also makes the views
emit currentItemChanged() which has some undesirable side effects. so
don't do it an fix the header manually.
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-4429
|
| | | |
| | |
| | |
| | |
| | | |
otherwise qlocale will silently clobber the user's (most probably bogus)
choice anyway.
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
there is really no point in doing so
Reviewed-by: hjk
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
the translator comment field is not written out, so reading the
definition into it is basically discarding it as far as any roundtrips
which arrive at qph again are concerned.
the message's disambiguation seems most suitable for the task.
Reviewed-by: hjk
Task-number: QTBUG-4498
|
| | |/
| |
| |
| |
| |
| | |
qlocale.h includes qobjectdefs.h which forward-declares it as a class.
Reviewed-by: aportale
|
| |/
|
|
| |
Reviewed-by: Thierry
|
| |\ |
|
