| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
(cherry picked from qttranslations/b9a22c997c1a988ff8e6b52893e4673e9ac69a2b)
Change-Id: I050998c14f4053a5c006d7a0da8b8befb21902b0
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g'
Manually patched files:
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
src/3rdparty/s60/eiksoftkeyimage.h
tools/qdoc3/test/qt-project.qdocconf
tests/auto/qsharedpointer/nontracked.h
tests/auto/qsharedpointer/nontracked.cpp
Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
| |
Change-Id: Id580c16b6d0ea6249c4f7359d2464b34a3e4480e
Reviewed-by: Xabier Aramendi <azpidatziak@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
| |
Qt 5's translation is already fixed.
Change-Id: Ief4aa4fbea1f076c77e53f0f5b5ac00bfb1aa9f1
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
| |
Change-Id: I8aa6df64a8454a5e916e038d6a8bfa6aef7b6de4
Reviewed-by: Ahmed Saidi <justroftest@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
| |
Started-by: Diego Iastrubni <diegoiast@gmail.com>
Change-Id: I32932ec0b5b1c96ef5f18da0297ef646c5780c24
Reviewed-by: Genghis Khan <genghiskhan@gmx.ca>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-33271
Change-Id: I09fb79d2c55078445e3b91530984c46a1bd721c0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
| |
Tiny fixes, mostly about copyright years.
Change-Id: I9223eaabccb1ce93f1688f3512344dbcfb05aa6a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
| |
Change-Id: I7cc7d9e34ea36c83e22b2eb29f300d3132c5f18e
Reviewed-by: Roman Paholík <wizzardsk@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
| |
Change-Id: I7119ddfd8fb135adc7561451d5b5a25f3f4f7d4c
Reviewed-by: Franklin Weng <franklin@goodhorse.idv.tw>
Reviewed-by: Liang Qi <liang.qi@digia.com>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
Change-Id: Idb88b4e72548dfa641c6b8ce78a661fa61757ad0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
| |
Change-Id: I4e958c1a0053a0c582a10a36dc0f4841ad39f715
Reviewed-by: Leonard Lee <leonard.lee@nokia.com>
Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I30537aed87cc793c74588f0220072e97b7232e46
Reviewed-by: Mahdi
Reviewed-by: Abbas Farahmand
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Change-Id: I52ae2101dd60881ffb9e5202b8351d8bd192e42a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I27320a1a1553fa9f36e00c9395ff2fad2c40cb03
Reviewed-by: Tomas Pospichal <tm.pospichal@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
| |
Change-Id: I0eb1aa9cc6c3fd11ca530590cb6052fd69c720f8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Change-Id: I149ca83e408d62b240b6ae2f0c5f3ec630b1b709
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ic910dc63db5625640735e2918f09c75a1d8669cc
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It seems that in the past I have modified the source strings for
copyright messages, but have failed to also modify some of the
translated versions of those strings. That resulted in some of the
strings being duplicated by Linguist and marked as obsolete. This time,
I have removed those obsolete duplicates and modified all of the
translated versions of the strings where the year is represented with
hindu-arabic numbers. The one exceptions is the farsi translation
(qt_fa.ts), for which I am unable to translate the year.
Change-Id: I224e9402f8cf1f02e301a6601a66680fd8fa5d0b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
|
| |
|
|
|
|
|
| |
Merge-request: 1493
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
|
|
|
|
|
| |
Merge-request: 2715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Merge-request: 2703
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Merge-request: 2700
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Merge-request: 1417
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Merge-request: 1416
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add -nn for .cpp MOC preprocessing for INTEGRITY
Remove commented out code.
Update Polish translations for 4.8
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/getting-started/installation.qdoc
doc/src/platforms/platform-notes.qdoc
src/corelib/tools/qlocale_symbian.cpp
src/gui/kernel/qwidget_p.h
src/network/access/qnetworkaccesshttpbackend.cpp
src/opengl/qgl.cpp
src/plugins/bearer/symbian/qnetworksession_impl.cpp
|
| |
| |
| |
| |
| | |
Merge-request: 1401
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 1415
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 1406
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 1404
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \ |
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qwidget_s60.cpp
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2640
Reviewed-by: ossi
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1303
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/ /
| |
| |
| |
| | |
Merge-request: 1315
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Fix some inconsistent translations.
* Translate some missing messages.
* Update Japanese phrasebook.
Merge-request: 1249
Reviewed-by: ossi
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
skip the ipv6 Host checking for the moment, since it fails on Windows XP. will fix later
remove duplicate message
fix "Host" header of ipv6 URLs in QNAM
uic: Use QString::fromUtf8 for QUrl properties.
uic: #include <QLayout> for QToolBox on non-laid-out forms.
add test case for ipv6 url parsing
|
| | | |
| | | |
| | | |
| | | | |
search and replace in a non-plaintext file. how intelligent.
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
|