| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
| |
Fix crash when select translation after close and open file.
This patches includes refactoring of b68b59f252930538cc124b31decc990ab57bea20
Merge-request: 1480
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ |
|
| |\
| | |
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Doc: Fixing typo
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Reducing the amount of spelling errors from NBN.
Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86
Reviewed-by: Rohan McGovern
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* MessageEditor keeps deleted editor as m_selectionHolder.
QOjbect::destroyed() SIGNAL doesn't fit to fix this problem
due to destruction order problem.
Merge-request: 1466
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |
|
|/ / |
|
|/
|
|
|
|
|
|
| |
Fixes dragging documents on Linguist dock icon, double clicking document
in Finder, and the "open" terminal command.
Task-number: QTBUG-20194
Reviewed-by: Oswald Buddenhagen
|
| |
|
|
|
|
|
|
| |
Replaced std::cout with QTextStream
Reviewed-by: Eckhart Köppen
|
|\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix build on windows 7
|
| |
| |
| |
| | |
remove pointless epocroot.pri inclusion
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits)
Fix autotest on Windows
Compile on Mac OS X
Ammend last commit
Implemented QAccessibleTextEdit::attributes()
Changing cursor position in all boundaries
code clean-up for QSystemSemaphore
simplify QSharedMemoryPrivate::cleanHandle()
minor improvements for QSharedMemory
fix potential keyfile leaking
refactoring of the QWSSharedMemory class
allow the user to averride QT_QWS_TEMP_DIR in qplatformdefs.h
minor typo fix
minor code simplification
minor code simplification
avoid the QT_NO_ASCII warning
remove an unused headers
nano optimization
don't reallocate memory if the old buffer has sufficient capacity
fix potential memory leaking
don't delete the lock if it was not created by this surface
...
|
| |
| |
| |
| | |
our policy and even more its implementation is mildly braindead ...
|
| |
| |
| |
| | |
we call qmake now
|
| | |
|
| |
| |
| |
| |
| | |
erase messages instead of building a new list of non-dropped ones.
modify messages instead of replacing them with modified copies.
|
| | |
|
| |
| |
| |
| |
| | |
it's inefficient to construct a new list. on top of that, the only user
actually checks the message state again.
|
| |
| |
| |
| | |
it's redundant with find() now, as the latter is cheap now
|
| | |
|
| | |
|
| |
| |
| |
| | |
this "factory" served only to obfuscate the code
|
| |
| |
| |
| |
| | |
qt creator as of ddb918f.
not feeling like replaying the whole history ...
|
|\ \
| |/
|/| |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|/ / |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
an empty line number does not indicate relative loc info - it may be the
result of -no-ui-lines.
instead, an empty file name does indicate it - no file name at all makes
no sense, so this means a previous messages has set it already. and we
need this additional detection, as the entire ts file may have no line
number info to base the decision on at all.
|
|\ \ |
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-18625
|
|/ /
| |
| |
| |
| |
| | |
Task-number: QTBUG-18374
Reviewed-by: Olivier Goffart
Merge-request: 1157
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/opengl/qwindowsurface_gl.cpp
|
| |
| |
| |
| | |
Task-number: QTBUG-14728
|
|\ \
| |/ |
|
| |
| |
| |
| | |
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: (67 commits)
Avoid possible font name collisions on fbserv
Update of Czech translation for Qt 4.7-stable
Fix crash in QtScript/JSC stack allocator on Symbian
HTTP: fix digest authentication
Fix loop count in animanted gifs sometimes being incorrect
Fixed UTF-8 application names in device application menu in Symbian
Validate arguments to QDBusConnection::connect
make the test a bit stricter
ignore the warning from auto-detach in destructor
get rid of extra calls to handle()
simplify QSharedMemory::detach()
avoid extra calculations
fix error reporting on detach()
fix error reporting
Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.
Fix to pen state handling in OpenVG paint engine.
BorderImage fails for .sci source containing a URL
positionViewAtIndex can fail when positioned near end of list.
Revert "Fix loaded() signal to be emitted only once"
Revert "don't include harfbuzz where we don't use it"
...
|
| |\ \
| | |/
| | |
| | |
| | |
| | | |
Conflicts:
configure
src/network/bearer/bearer.pri
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-16369
|
|/ /
| |
| |
| |
| | |
Merge-request: 1030
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/text/qfontengine_s60.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
they cause a crash. fixing it properly would be in no reasonable
relation to the gain (none whatsoever), so just forbid it.
yes, this breaks the message freeze ... big deal in a translation
application. ;)
Task-number: QTBUG-14574
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/corelib/global/qglobal.h
src/gui/kernel/qwidget_p.h
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
tests/auto/qthread/tst_qthread.cpp
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/qdeclarative.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
|