| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Fix conversion of QAbstractItemModel::rowsMoved() parameters
|
| | |
| |
| |
| |
| |
| |
| | |
VisualDataModel was emitting itemsMoved() signal with incorrect
"to" value when multiple items were moved forwards.
Reviewed-by: Martin Jones
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (21 commits)
Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"
Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"
In 4.7 QFileInfo::absolute(File)Path returned clean paths
ret is an "internal" path, no need to re-process it
We prefer capitalized drive letters, make it so sooner
Don't second-guess the "engine"; call cleanPath on absolutePaths
Compare non-canonical paths before falling back on expensive computation
Fix QDir::operator==(const QDir &) const
Off-by-one error in assert condition...
Leftovers from 401722ef9e6fe79bd41f9d5f79668f5c4997c8e6
Merged fileTemplate test with QTBUG_4796
Cleanup code: removing empty stubs
Fix QTemporaryFile regressions and new found issues
Use "native paths" on POSIX platforms as well
Cleanup #includes
Add output on test failure
Atomic implementation of create file and obtain handle for Win/Symbian
Minimize encoding conversions when generating unique file name
Use QStringBuilder when copying template for modification
Make Symbian follow Windows code in temporary path generation
...
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We can't rely on absolute paths when comparing directories for equality
as these don't take into account symbolic links and may also bypass ../
and ./ simplification.
Instead, canonical paths must be computed and can then be compared
according to the case sensitivity rules for the platform or file engine,
as is done in QFileInfo.
Task-number: QTBUG-20495
Reviewed-by: Prasanth Ullattil
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The latter was more thorough, but didn't test setting the file template
after construction, while the former included some prefix/suffix
combinations that weren't specifically tested in the latter.
Reviewed-by: Shane Kearns
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Shane Kearns
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
With this change, the file template is always processed in original
QString format. Trying to generate native paths before adding a missing
placeholder mask could change the meaning of templates, such as "." and
"..", which are now tested to mean "..XXXXXX" and "...XXXXXX",
respectively.
After ensuring the template includes a placeholder mask, the path is
converted to a native *absolute* file path and the mask is sought for
again. On Windows, native paths were already absolute. On Symbian, we'd
need at least a clean path, as "." and ",," are not natively understood.
There is a requirement that the placeholder mask /XXXXXX+/ makes it
through this conversion unaltered, which relaxes prior requirements on
*nix platforms. On Windows and Symbian the conversion is under Qt's
control and not user-configurable.
Reviewed-by: Shane Kearns
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Shane Kearns
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Besides generating a unique name, createFileFromTemplate now also
acquires a file handle on all platforms. The file engine's native handle
is passed by reference and modified in place.
This fixes a long standing security issue on Windows.
On Windows and Symbian platforms we directly use the "native" file path
when processing the template and generating the unique name. Since the
native encoding is known, conversions at this point are safe.
Errors other than "file exists" are propagated to Q(Temporary)File,
and result in a failure in open(). The changes also unify error handling
and should give consistent behaviour across all platforms.
Worthy of note, there's a change in behaviour on Windows and Symbian:
fileNames returned by QTemporaryFile on Windows and Symbian are always
absolute after open has been called. This has to do with how
QFileSystemEntry::nativeFilePath works on these platforms. (Test was
updated to reflect change in behaviour.)
Reviewed-by: Gareth Stockwell
Reviewed-by: Shane Kearns
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fixed use of deleted object in XmlPatterns EvaluationCache
Crash when creating scroll bar skin graphics on S60 (debug only)
QS60Style omits drawing theme background in some Symbian SDKs
Fix for qml1shaderplugin GPU resource handling on Symbian
Make it easier to select words at the start of a line.
Doc: Fixing typo
In landscape mode QComboboBox popup can not be showed completely
Fix left alignment of native RTL pre-edit text.
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Make it easier to select words at the start of a line.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QTextControl's word selection will only include a word if the cursor
position is past the mid point of the word. This can make it
difficult to select words near the edges of the screen on touch
devices. For the TextEdit word selection mode select a word ignore
the relative position within a word.
Change-Id: I2bc61376f663836fedd7e157448f0b565a64d485
Task-number: QT-5206
Reviewed-by: Martin Jones
|
| | | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Doc: Fixing typo
Fix left alignment of native RTL pre-edit text.
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
If there is no committed text in a TextInput or TextEdit determine
if the pre-edit text is right to left before falling back to the
global keyboard settings.
Change-Id: I7e5568e936341602b8faf7be120f9a770c115f48
Task-number: QMLNG-72
Reviewed-by: Michael Brasser
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Spelling fix
Fixed lost flushes in raster window surface.
uikit: Use correct pixmap data format.
Correctly position aliased lines with flat caps
|
| | | |_|_|_|/ /
| |/| | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: trustme
|
| |\ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
test: Fix `tst_qfiledialog' in a namespaced build
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: Pierre Rossi
|
| | | |\ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
tests: Skip `qaudioinput' tests if there is no audio backend available
tests: fixed crash of tst_qdialog
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
This code was always passing when no audio backend was available,
skip the tests in this case instead.
Change-Id: I4c0060ff144fa497a21823ffcab101ff68b84e17
Reviewed-by: Rohan McGovern
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
This test assumed that C++ exceptions could always be caught by the
event loop. This is not the case when the Glib event loop is used.
Skip the relevant portion of the test in that case.
Change-Id: I2ad83386025a98f6c32202700c97e04ef3dff343
Reviewed-by: Kalle Lehtonen
Reviewed-by: Sergio Ahumada
(cherry picked from commit 569cd194d20e61d35768b210b4351f4eeb5c1ef8)
|
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
tests: fixed crash of tst_qdialog
|
| | | | |/ / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
This test assumed that C++ exceptions could always be caught by the
event loop. This is not the case when the Glib event loop is used.
Skip the relevant portion of the test in that case.
Change-Id: I2ad83386025a98f6c32202700c97e04ef3dff343
Reviewed-by: Kalle Lehtonen
Reviewed-by: Sergio Ahumada
(cherry picked from commit 569cd194d20e61d35768b210b4351f4eeb5c1ef8)
|
| | |\ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Handle CloseSoftwareInputPanel event in QCoeFepInputContext
Fix delayed password masking mid-string.
don't crash when destroying codec list
|
| | | |\ \ \ \ \ \ \ \
| | | |_|_|/ / / / /
| | |/| | | / / / /
| | | | |_|/ / / /
| | | |/| | | | | |
|
| | | | |\ \ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | / /
| | | | |_|_|/ /
| | | |/| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix delayed password masking mid-string.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Unmask the last character typed, not the last character in the string.
Change-Id: I9c70d2347bf878c18ab0a7f4ea76f755ca19a85c
Task-number: QTBUG-17003
Reviewed-by: Alan Alpert
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge-request: 1253
Reviewed-by: Thiago
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
|
| |\ \ \ \ \ \ \
| |/ / / / / / |
|
| | |\ \ \ \ \ \
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/gui/kernel/qwidget_s60.cpp
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Done-with: mae
|
| |\ \ \ \ \ \ \
| |/ / / / / / |
|
| | |\ \ \ \ \ \
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
examples/webkit/fancybrowser/fancybrowser.pro
src/3rdparty/libpng/ANNOUNCE
src/3rdparty/libpng/CHANGES
src/3rdparty/libpng/CMakeLists.txt
src/3rdparty/libpng/LICENSE
src/3rdparty/libpng/README
src/3rdparty/libpng/configure.ac
src/3rdparty/libpng/example.c
src/3rdparty/libpng/libpng-manual.txt
src/3rdparty/libpng/libpng.3
src/3rdparty/libpng/libpngpf.3
src/3rdparty/libpng/png.5
src/3rdparty/libpng/png.c
src/3rdparty/libpng/png.h
src/3rdparty/libpng/pngconf.h
src/3rdparty/libpng/pngerror.c
src/3rdparty/libpng/pnginfo.h
src/3rdparty/libpng/pnglibconf.h
src/3rdparty/libpng/pngmem.c
src/3rdparty/libpng/pngpread.c
src/3rdparty/libpng/pngpriv.h
src/3rdparty/libpng/pngread.c
src/3rdparty/libpng/pngrtran.c
src/3rdparty/libpng/pngrutil.c
src/3rdparty/libpng/pngset.c
src/3rdparty/libpng/pngstruct.h
src/3rdparty/libpng/pngtest.c
src/3rdparty/libpng/pngtrans.c
src/3rdparty/libpng/pngvalid.c
src/3rdparty/libpng/pngwrite.c
src/3rdparty/libpng/pngwtran.c
src/3rdparty/libpng/pngwutil.c
src/gui/dialogs/qfiledialog_symbian.cpp
src/gui/kernel/qsoftkeymanager.cpp
src/s60installs/s60installs.pro
|
| | | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Move cursorDelegate with the mouse selection of read only text input.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: Iae4b2f9f6c9a7da7ec0e194b2568fb3a6da8ea71
Task-number: QTBUG-19109
Reviewed-by: Martin Jones
|
| |\ \ \ \ \ \ \
| |/ / / / / / |
|
| | |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QmlInspector: Fix moc error
QmlInspector: Fix compile for QT_NO_CURSOR
QmlInspector: Remove unused toolbar
JSDebugger: Only hit breakpoints in user code
Prevent Binding from crashing when its target object is deleted.
Cleanup QMLViewer properly when exiting via File->Quit.
Fix crash when assigning a list property to transitions.
Qml Debugging: only read properties that can be displayed in the debugger
qmldump: Fix creation of objects from QDeclarativeTypes.
Document state fast-forwarding.
qmlplugindump: Update qmltypes file format documentation.
|
| | | |\ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: Ic83cfcaeccf6639976864bb2f38f5bcff16e2b11
Task-number: QTBUG-20692
Reviewed-by: Martin Jones
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This fixes the crash, but doesn't actually assign any
Transitions (the transitions list will now be empty, rather
than contain a null Transition object). Correct assignment
is a general language issue, and will be fixed separately.
Change-Id: I6aaba4eaf6faa513e54d99b27fe9f9a705eea40b
Task-number: QTBUG-20227
Reviewed-by: Alan Alpert
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Make sure that clicks in the corners of buttons with
Mac style are treated properly. Added test case.
|
| |\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Fix race condition in processJobs()
Don't endless loop
Compile on symbian
Don't release register prematurely
Rework threading internals in XmlListModel to avoid global static
Doc
Doc
Compile in namespace
Fix alias warnings in QML compiled bindings
Fix alias warnings in MetaCallArgument
Fix alias warnings in QDeclarativeVME
Fix alias warnings in QDeclarativeGuard
|
| | |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | |
| | | | | | |
| | | | | | | |
Conflicts:
doc/src/declarative/qtbinding.qdoc
|
| | | |/ / / /
| |/| | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-20648
|
| | |/ / / /
|/| | | | |
|
