| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
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
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/examples/wheel.qdoc
src/gui/util/qflickgesture.cpp
src/gui/util/qflickgesture_p.h
src/gui/util/qscroller.cpp
src/gui/util/qscroller.h
src/gui/util/qscroller_p.h
src/gui/util/qscrollerproperties.cpp
src/gui/util/qscrollerproperties.h
tests/auto/qscroller/tst_qscroller.cpp
|
| | |\ \ \
| | | |/ /
| | |/| /
| | | |/ |
|
| | | | |
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\ \ \
| |/ /
| | |
| | | |
merge-requests/1220
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QmlViewer: Translate UI
Fix insert and scroll to bottom case
QDeclarativeDebug: Fix test case
QDeclarativeDebug: Handle case where client with ongoing queries is deleted
Remove compile warning
Fix QUnifiedTimer bug
Stop the animation driver when there are no more animations.
Optimization and benchmark for setting object properties from QML.
Add Constant and Final flags to QMetaObjectBuilder
Fixed QML TextEdit docs
Make -no-opengl exist on other platforms
Only ask for name when the user goes on the high score list.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Install translators for the Qt & QmlViewer translations. also
add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated
strings.
Reviewed-by: Oswald Buddenhagen
Task-number: QTBUG-14848
|
|/ / /
| | |
| | |
| | |
| | | |
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
|
|\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
src/plugins/qmltooling/qmldbg_ost/qostdevice.h
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1021
Reviewed-by: ossi
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
Fix compilation with symbian-armcc
Updated Russian translation
Ukrainian translation updated
Fix wrong merge of 3aa39b0164ce4bb9e
Symbol table is very limited in numeric input mode
Fix build of Qt/DirectFB without graphics view support.
Add new QSysInfo::symbianVersion() enums
QDesktopServices::openUrl() doesn't handle URL encodings correctly
Build fix for transition effect support on S60 5.0.
Make EGL surface transparency working on Symbian.
QmlDebug: Fix license headers in new ost plugin
Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
Resolve unqualified attached properties correctly
Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
QDeclarativeDebug: Don't crash when connection is closed
Splitview flag should also be updated to inputcontext
QGraphicsView with vertical scrollbar flickers when splitview opens
Splitview: opening a context menu should not re-position of focusItem
Trigger fullscreen transition effects properly on app exit.
...
|
| |\ \ \
| | |/ /
| | | /
| | |/
| |/| |
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2596
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1189
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/ / |
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
|
| |
| |
| |
| | |
Reviewed-by: Pawel Polanski <pawel.3.polanski@nokia.com>
|