| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
QNetworkProxy takes an hostname, not an url.
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Merge-request: 1319
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
a) don't detach until an occurrence found
b) don't memmove every time an occurrence found
c) truncate quickly )
well, numbers are better than words:
before:
RESULT : tst_QList::removeAll_primitive():
2,617,902 CPU ticks per iteration (total: 261,790,171, iterations: 100)
RESULT : tst_QList::removeAll_movable():
2,547,540 CPU ticks per iteration (total: 254,753,960, iterations: 100)
RESULT : tst_QList::removeAll_complex():
16,852,099 CPU ticks per iteration (total: 1,685,209,906, iterations: 100)
after:
RESULT : tst_QList::removeAll_primitive():
73,520 CPU ticks per iteration (total: 73,520,442, iterations: 1000)
RESULT : tst_QList::removeAll_movable():
90,422 CPU ticks per iteration (total: 90,422,464, iterations: 1000)
RESULT : tst_QList::removeAll_complex():
9,667,073 CPU ticks per iteration (total: 9,667,072,670, iterations: 1000)
Merge-request: 1285
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |/
|/| |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Make macdeployqt more robust against usage of symbolic links.
Document support for Linguist on Mac.
Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle.
Guard macdeployqt against @rpath and @loader_path too.
Fix typo.
OpenVG cleanup.
Include trailing space width in RTL text line width
Fix the compilation error when QT_NO_PLUGIN_CHECK was set.
Fixed holes in border image drawing by introducing new API.
Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2.
Revert "fix QFileInfo::isSymLink() for NTFS mount points"
Remove debug output.
Add some sound support to the uikit platform.
Add flickrdemo uikit example project.
Fix uikit simulator build.
Get subpixel antialiasing again w/combo of raster and affine transform
Add initial support for bitmap version 4/5 headers.
optimize QRawFont::supportsCharacter()
Switch to use floating point pixelSize in QRawFont completely
Add a way to check if we have a matching family in the database.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The headers are just skipped, information stored in them is ignored.
Merge-request: 824
Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Make it possible to update a related table after an external update
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When a table that is related to in a QSqlRelationalTableModel gets
updated in some way (e.g. a new row, or the data is changed) then the
related model could not be updated without recreating the
QSqlRelationalTableModel.
Now, to get around this, select() can be called on the related model to
get it to be updated.
Task-number: QTBUG-7885
Reviewed-by: Charles Yin
Reviewed-by: Michael Goddard
Change-Id: Ic589e840234f3a809bcb112a807a87afe0bc25ca
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
For completeness, the -datatags command-line option in QTestLib
now prints the test case name at the start of each output line.
NOTE: Although the file name is supposed to match the
lower-case version of the test case name, this is currently
not true in all cases (particularly not under tests/benchmarks).
Even if there was a script to enforce this convention,
the -datatags option now provides this information in a reliable way.
This patch also drops the parentheses after the test function
as these are always empty anyway.
Data tags for each test function (f() in this case) are printed in
four different ways depending on the presence of local and global
data tags:
Case 1: No tags:
tst_MyTestCase f
Case 2: Local tags only:
tst_MyTestCase f local tag 1
tst_MyTestCase f local tag 2
...
Case 3: Global tags only:
tst_MyTestCase f __global__ global tag 1
tst_MyTestCase f __global__ global tag 2
...
Case 4: Local and global tags:
tst_MyTestCase f local tag 1 __global__ global tag 1
tst_MyTestCase f local tag 2 __global__ global tag 1
...
tst_MyTestCase f local tag 1 __global__ global tag 2
tst_MyTestCase f local tag 2 __global__ global tag 2
...
...
Change-Id: Id9273039a5d33527c32abf6eb1baef80193fa585
Reviewed-by: Rohan McGovern
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If the variable QTDIR is not set, you might end up checking
all the system libraries symbols.
Change-Id: I7b079d7e10fccad962cd3b2ced317eb35840bd71
Reviewed-by: Rohan McGovern
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Certain benchmarks that referred to private
headers are removed from the list of 'trusted'
benchmarks.
Benchmarks referring to private headers are considered
bad practice for several reasons:
1) Such tests won't even build if private headers
are not avaiable in the installed version of Qt.
2) APIs should be designed well enough to be fully
testable through its public headers only.
Change-Id: Iccd81e12829a7b7f4bd2b88a72f3e9722520f6e2
Reviewed-by: Rohan McGovern
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Applies the fix of Commit 9c1e358df4b0af1a6299ea7932f8b2e8af840873
(review by Liang Qi) to four more test cases.
Change-Id: I1483d4b7c2aecde960af5d98fb8b772aeba20ec5
Reviewed-by: Sergio Ahumada
Reviewed-by: Liang Qi
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ie1f52be4e94ff1e51b9d5f47c75a8d2e8b7a63d4
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Passing the -datatags option to a QTestLib program prints the available
data tags to standard output.
Data tags for each test function (f() in this case) are printed in
four different ways depending on the presence of local and global
data tags:
Case 1: No tags:
f()
Case 2: Local tags only:
f() local tag 1
f() local tag 2
...
Case 3: Global tags only:
f() __global__ global tag 1
f() __global__ global tag 2
...
Case 4: Local and global tags:
f() local tag 1 __global__ global tag 1
f() local tag 2 __global__ global tag 1
...
f() local tag 1 __global__ global tag 2
f() local tag 2 __global__ global tag 2
...
...
Reviewed-by: Rohan McGovern
Task-number: QTQAINFRA-226
Change-Id: I14de203b586a0085b8efda8e62772711e44677d2
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Commit 8f95a19d330480bd86650c3d2e4e147d3bca5789 fixed the "missing Z"
of QDateTime::toString for Qt::ISODate (see QTBUG-9698). The testdata
for this test should have been updated at the same time, but it was
forgotten.
Reviewed-by: Jason McDonald
Change-Id: I9b03519805533665afac15e0c970ac1c9e5d9ab4
|
|\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Remove testing for Hide of mainwindow.
Fix accessibility test for QWS.
Fix test for win and mac.
Add constants to QAccessible::Event enum.
Call QAccessible::updateAccessibility when setText is called on QLabel
Fix autotest for accessible tables.
Style cleanup - space after flow control keywords.
Add IAccessible2 table2 implementation.
Fix a crash with QGraphicsScene.
Use name for combobox on Unix.
QProgressBar: transparent background on Windows Vista (partId: PP_BAR -> PP_TRANSPARENTBAR)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This event is not used anywhere and the
test seems to fail randomly.
Since this line causes more trouble than it helps
simply remove it.
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
For some reason we don't get the hide signal on QWS.
Reviewed-by: Gabi
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Accidentally removed & in some places.
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The new table2 interface is ifdef'ed to only be used on X11.
This adapts the auto test.
Improve handling of accessible events and clean up.
There are two xfails for the Table and Tree where sibling
navigation is not implemented yet.
Reviewed-by: TrustMe
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Implement the IAccessible table2 interface for itemviews.
This is simpler than what we have in complexwidgets.
For now it is only used on Linux.
Reviewed-by: Gabi
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
QNetworkAccessFileBackend: Add warning for file url without scheme.
Native memory mapped file support
Fix compiler warning
Create QScopedResource class
|
| |\ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When the scheme is not set for a file we should accept the url but
add a warning. The behaviour will change for Qt5 in which we should no
longer accept the url if the scheme is not set.
Task-number: QTBUG-17731
Reviewed-by: Markus Goetz
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Move separator skipping to proper place
Skip shaping for hidden line/paragraph separators
Support interface orientation for uikit.
Add support for opening LinuxInput devices exclusively ('grabbing').
Fixed regression in compilerwarnings.
Properly quit the input event thread in the directfb platform plugin.
Apply 57993ba7 properly to 4.8
Deprecate some QPixmap functions (marked as obsolete already).
Deprecate some functions in QImage (that have been obsolete since 4.1).
Add QLocale::toUpper/Lower
Fix warning for uninitialized variable
|
| |\ \ \ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The toUpper/Lower() methods in QString should not
be locale dependent, as this can lead to rather
hard to find bugs in at least a turkish locale.
Rather have explicit, locale dependend case conversions
available in QLocale.
Reviewed-by: Denis Dzyubenko
|
|\ \ \ \ \ \ \ \
| |_|_|_|_|_|/ /
|/| | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
|
| |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Delay masking the last character in Password echo mode.
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an
integer value in milliseconds, QLineEdit and TextInput will display
the last character entered unmasked for that delay period and then
mask the character as normal. If QT_GUI_PASSWORD_ECHO_DELAY is
not defined then the behaviour is unchanged.
Change-Id: I55f527932d34453828caba88e93ad57e012e79be
Task-number: QTBUG-17003
Reviewed-by: Martin Jones
|
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Updated license headers.
Add system tests from research:systemtests repository.
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Improve the response of the views when SnapOneItem/Row is enabled.
In this case it is best to be much more reactive to the user input
since even a small movement in a particular direction indicates
a change to the next/previous item.
Change-Id: I6a8eb689c3b12cdc67f24106032e36bba82d2846
Task-number: QTBUG-19874
Reviewed-by: Bea Lam
(cherry picked from commit e7bebcf0c59368340df524db4a53ae2595d057d7)
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Change-Id: Ib995961d7b1a939e5feb86d72a82408d1ceebe88
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit 8fbb802fa50d0a01c9c01d007a3e016c45fa863c)
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Change-Id: Id2693a69739886f9a171f3f6438a5404dff8e901
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit 927b22b06ee2e749395e73f457fe3c16ea087864)
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Try slowing down the flick to give the slow CI machine a better
chance of success.
Change-Id: Id61473e73a38bb888b9bee47cffb913c936155b9
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit 343069c7843321b33f06bfd42d476abae76dcece)
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Interval of 10ms between synthesized flick move events is too prone
to timing difference on CI platforms.
Change-Id: Id5da794a7294868c8f5e544fa71edeec967e31ca
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit 6fb7cdf8741ca924413dd7cbc09fad91ddc04823)
|
| |/ / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Ensure the smoothed velocity is set at the start of the flick. Ensure
that the smoothed velocity animation isn't restarted unless there is
new valid data.
Change-Id: I00f8bbf1fe91faeea752b093c4658ad0f53ad06d
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit a2d97672bfaace677a4308db93f5802ba53af46e)
|
| |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Re-apply licenseheader text in source files for qt4.7
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Fixed license text in files having old license.
Reviewed-by: Trust Me
|
| |_|_|_|/ / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Instead of using a simple INNER JOIN, like:
SELECT a,b,rel.c FROM table1, table2 WHERE (table1.smthing =
table2.smthing)
which doesn't show row where foreign keys are NULL, allow use of LEFT
JOIN like:
SELECT a,b,rel.c FROM table1 LEFT JOIN table2 ON table1.smthing =
table2.smthing
The trick works also for multi-relational tables.
Just remember to use the new API setJoinMode.
Signed-off-by: DaNiMoTh <jjdanimoth@gmail.com>
Change-Id: I349f9418e4859923977942add59872b000cac2c5
Task-number:QTBUG-8217
Reviewed-by:Michael Goddard
Reviewed-by:Charles Yin
Merge-request: 2576
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|