| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Needed due to commit 3636e666528b72de79f8c7012690bb9e279f0863
|
|
|
|
|
|
| |
The return value is not reported (we need a separate callback for that,
just like in the interpreter), but that isn't important to get our
tools (i.e. the debugger) working.
|
|\ |
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp
|
| | | |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
When MSVC is used the default DESTDIR makes use a release/debug suffix.
For these tests DESTDIR needs to be "."/
Minor code cleanup was done whilst correcting these effected .pro files
Reviewed-by: Lincoln Ramsay
|
| |
| |
| |
| |
| |
| |
| | |
That ensures we don't create ambiguities. QSharedPointer shouldn't have
any implicit constructors.
Suggested-By: Olivier Goffart
|
| |
| |
| |
| | |
Reviewed-by: Trustme
|
| |
| |
| |
| |
| |
| | |
Currently there are some differences in behavior and availability
of information between the interpreter and the JIT. This is now
documented as expected failures in the relevant autotests.
|
| | |
|
| |
| |
| |
| | |
It even works better than with the interpreter
|
| |
| |
| |
| |
| |
| |
| | |
The GL2 paint engine now has it's own class ID. This patch also reduces
the excessive 2000ms delays to 200ms. :-)
Reviewed-by: Trustme
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The signal index actually emitted was different from the signal index
registered. This was due to recent changes in the meta-object protocol, where
new indexes are being created (cloned) for signals with default parameters.
When registering the transition signal, we now look for the original (non
cloned) signal index. The transition keeps track of the user-specified signal
index, and sets it when calling onTransition.
Reviewed-by: Kent Hansen
Reviewed-by: Olivier Goffart
Task-number: 260403
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This commit deprecates the QAIM::reset() method, and adds beginResetModel()
and endResetModel() methods, addressing Qt issue 247023.
http://www.qtsoftware.com/developer/task-tracker/index_html?method=entry&id=247023
If models and proxies use QAIM::reset() alone, then proxies will
emit modelAboutToBeReset after its source model is reset. This means that mapToSource
will not behave as expected (Will always return an invalid index) in a slot connected
to modelAboutToBeReset.
The usecase for this is maintaining viewstate (which items are selected, expanded)
when the model is reset. See BrowserWidget::modelChanged here:
http://websvn.kde.org/trunk/KDE/kdepim/akonadi/akonadiconsole/browserwidget.cpp?view=markup
Task-number: 247023
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
Merge-request: 1072
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
config.tests/unix/opengles2/opengles2.cpp
tests/auto/linguist/lupdate/testdata/recursivescan/bar.ts.result
tests/auto/linguist/lupdate/testdata/recursivescan/foo.ts.result
tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
tests/auto/windowsmobile/test/ddhelper.cpp
tests/auto/windowsmobile/testQMenuBar/main.cpp
tests/auto/xmlpatternsxqts/lib/ASTItem.cpp
tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp
tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp
tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp
tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp
tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp
tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp
tests/auto/xmlpatternsxqts/lib/Global.cpp
tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp
tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp
tests/auto/xmlpatternsxqts/lib/TestCase.cpp
tests/auto/xmlpatternsxqts/lib/TestContainer.cpp
tests/auto/xmlpatternsxqts/lib/TestGroup.cpp
tests/auto/xmlpatternsxqts/lib/TestResult.cpp
tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp
tests/auto/xmlpatternsxqts/lib/TestSuite.cpp
tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp
tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp
tests/auto/xmlpatternsxqts/lib/TreeItem.cpp
tests/auto/xmlpatternsxqts/lib/TreeModel.cpp
tests/auto/xmlpatternsxqts/lib/Worker.cpp
tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp
tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp
tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp
tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp
tools/linguist/tests/data/main.cpp
tools/linguist/tests/tst_linguist.cpp
tools/linguist/tests/tst_lupdate.cpp
tools/linguist/tests/tst_simtexth.cpp
util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp
util/qlalr/examples/lambda/main.cpp
util/qlalr/examples/qparser/qparser.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
Simple misuse of QLatin1String. Use QString::fromLatin1 instead and
avoid the QByteArray temporary.
Reviewed-by: Andreas Aardal Hanssen
Tracking: CVE-2009-2700
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| | |
qmake's include function has been changed in 4.6.x and later to warn,by default, if the specified
file does not exist. It is possible to ignore missing .pri files, eg
include(SomeOptionalFile.pri, "", true);
Reviewed-by: Rohan McGovern
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
updateCurrentTime
That deletion removed the respective animation from the list of running
animations being processed, but not from the copy of the list introduced in
48489988521b818bda8d76e60cb272508e91b490, thus we had a dangling pointer.
Reviewed-by: thierry
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If this is broken it will usually seg-fault, but there's a few checks in
there just to make sure.
Reviewed-by: Samuel
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Samuel
|
| |\ \ \
| | |/ /
| |/| /
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result
tests/auto/linguist/lupdate/testdata/good/lacksqobject/expectedoutput.txt
tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp
tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result
tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.result
tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp
tests/auto/qcombobox/tst_qcombobox.cpp
tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp
tests/auto/xmlpatternsview/view/MainWindow.cpp
tests/auto/xmlpatternsview/view/TestCaseView.cpp
tests/auto/xmlpatternsview/view/TestResultView.cpp
tests/auto/xmlpatternsview/view/TreeSortFilter.cpp
tests/auto/xmlpatternsview/view/UserTestCase.cpp
tests/auto/xmlpatternsview/view/XDTItemItem.cpp
tests/auto/xmlpatternsview/view/main.cpp
tests/auto/xmlpatternsxqts/lib/ASTItem.h
tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h
tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h
tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h
tests/auto/xmlpatternsxqts/lib/Global.h
tests/auto/xmlpatternsxqts/lib/ResultThreader.h
tests/auto/xmlpatternsxqts/lib/TestBaseLine.h
tests/auto/xmlpatternsxqts/lib/TestCase.h
tests/auto/xmlpatternsxqts/lib/TestResult.h
tests/auto/xmlpatternsxqts/lib/TestResultHandler.h
tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h
tests/auto/xmlpatternsxqts/lib/Worker.h
tests/auto/xmlpatternsxqts/lib/XMLWriter.h
tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The subControlRect of the arrow and the listBoxPopup where assuming
the widget rect is at the origin.
Reviewed-by: Richard Moe Gustavsen
Reviewed-by: Pierre Rossi
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
For some types, an empty string is the correct and complete
conversion of the type. If the result is an empty string, use
QVariant::canConvert() to determine if that is indeed correct,
before falling back to the "string-conversion-not-available"
path.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This means it should respect the order that was defined with
insertItem() and addItem().
Note that this is not strictly necessary (as now explicitly written in
the docs for QGraphicsLayout::itemAt()), but commit
2ec56d158dc140f68efb45e2e0613f0e4026ddf6 broke the order and for people
that relied on this that commit caused a regression.
In addition, after commit 2ec56d158dc140f68efb45e2e0613f0e4026ddf6 it
was not longer possible to query the "item at visual index". Thus,
instead of adding another function (like QGGL::itemAt(int,int)) we make
sure that itemAt() also returns the "item at visual index".
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Check if QTabBarPrivate's movingTab member is 0 before dereferencing it.
This fixes a crash when double-clicking a tab. New unit test included.
http://bugs.kde.org/show_bug.cgi?id=202767
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
Merge-Request: 1337
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Multiple database connections could have differing ideas on the return
value for defaultCase. The cost of the call is so minimal that caching
is unnecessary, and static caching is very very wrong.
Reviewed-by: Justin McPherson
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
Reviewed-by: ogoffart
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This adds the function beginMoveRows, endMoveRows, beginMoveColumns,
endMoveColumns
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
Acknowledged-by: Thierry
Merge-request: 972
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
belonged to a deleted script engine
When the engine is deleted, the JSValue is invalidated, but the
QScriptValue's type will still be QScriptValuePrivate::JSC.
Use a new helper function, isObject(), that checks both that the
value is of type JSC _and_ that it is valid, before calling
JSValue::isObject() (JSValue::isObject() assumes that the value
is valid).
|
| | |
| | |
| | |
| | |
| | | |
It just ensures that the central widget gets its correct size
(ie. sizehint) when a menu bar is present.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If you do a selection with the mouse and react to selectionChanged by
changing the selection. Those changes would be overwritten by
QAbstractItemView::mouseReleaseEvent.
It is useless to set the selection on mouse release. We already do
that on mouse press.
Task-number: 250683
Reviewed-by: ogoffart
|
| | |
| | |
| | |
| | |
| | | |
This test would not pass if we sorted the signals by alphabetical order in the
moc (in order to do a binary search)
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Calling QScriptEngine::toStringHandle() is dead slow, so don't call it;
use JSC::Identifier directly.
This is the same issue as was fixed for setProperty() in commit
a8574172dd5e6bc11cf6f69b6fad5a063549e88d.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Otherwise the property is stored on the wrong object (the proxy).
This fix makes the Qt bindings generated by qtscriptgenerator work
again.
|
| | |
| | |
| | |
| | |
| | | |
We replaced the convolution filter in the drop shadow effect with a
blur filter; we have to update the test accordingly.
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|