| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
There was a serious regression wherei, under certain conditions,
assignment would be treated as an append. This was due to poor tracking
of container invariants inside realloc.
From now on, after the allocation decision, s shall contain the number
of elements in the array to be kept. Deleting extra elements in the old
array needn't update this value. Instead, it needs to be updated once
and if new elements are created afterwards.
Auto-test greatly expanded to avoid future embarassments.
Task-number: QTBUG-10978
Reviewed-by: Olivier Goffart
Reviewed-by: Fabien Freling
Olivier reviewed the patch, Fabien the auto-test.
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make test work with shadow builds again.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Broken by 0cdf33e9acb00b8f3654e8268253a3fb7c5db92c, which assumes the
binary and sources are in the same directory. The fix reverts the code
back to how it was in 4.5 (where it still works with shadow builds).
Reviewed-by: Denis Dzyubenko
|
| | | | |/ / |
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed bug where testlib would not respect the -iterations option.
Improve precision of testlib benchmarking.
QMetaMethod::invoke: Document that the function does not check the arguments
add test for QMetaMethod::invoke
Make QGLBuffer copiable
|
| | | | | | |
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Active window focus gain should not open virtual keypad
Use QElapsedTimer rather than QTime::elapsed()
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number:
Reviewed-by: Martin Jones
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Wrong QGraphicsItem::childrenBoundingRect() when applying effects.
Fix a bug in QDirectFBPixmapData::fromImage
Replace memmove with memcpy
Fixed compilation of QtOpenGL.
Optimize initialization of QStaticText
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Problem was that we used the children's raw bounding rect instead of
using their effective bounding rect when calculating the bounds.
Auto test included.
Task-number: QTBUG-10756
|
| |\ \ \ \ \
| |_|/ / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Remove superfluous forward declaration.
Update documentation for the -font command line option
Fixed a crash when creating QGtkStyle before QApplication
Added support for Indonesian language on Symbian.
Ensure that activation object has been created before popping scope of native context
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
native context
One shouldn't have to call activationObject() or scopeChain() before
calling popScope(); the scope chain should always have 2 items (activation
and global object) before we start popping anything from the internal chain.
Task-number: QTBUG-11020
Reviewed-by: Olivier Goffart
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Improve QML framerate debugging
If a pathview delegate changes size, reposition center on path
Remove deprecated Flickable::overshoot property.
Don't display unnecessary copyright headers in doc
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-11006
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | | |
Conflicts:
doc/src/declarative/advtutorial.qdoc
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This only happened with fully transparent ancestors (item's
effectiveOpacity() == 0.0). Problem was that we didn't take into
account the ancestors' opacity when removing an item from the scene.
More specifically: The calculated effective opacity for the item was
zero and we ignored update requests. We have to ignore the opacity if
any of the ancestors' ignoreOpacity bit is 1, which means the opacity
is set to 0 and the update request has not yet been processed.
Auto test included.
Task-number: QTBUG-10778
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Sort order was modified when sorted according to an empty column always
in the same order
Reviewed-by: Thierry
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_qxmlstream: fix in shadowbuild
QXmlStreamWriter: Auto-formatting does not behave properly with processing instructions.
Update the state of the keyboard modifiers on drop events.
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
instructions.
When writing a processing instruction with auto-formatting enabled, it should
put it in a new line for readability and apply the indentation properly.
Merge-request: 620
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Doc fixes, improvements
Allow js files with '.pragma library' to be used from WorkerScript
Add more examples of XPath expressions to XmlRole.
Open input panel on press if TextInput or TextEdit are already focused but panel has been closed
Fix horizontal/verticalCenter anchors bug.
Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap".
Fix for qml reloaded in qml viewer not being maximized properly on a device
Unify naming of import plugin targets
Add a way to control when software input panels are shown in TextInput and TextEdit elements
Replace QTime with QElapsedTimer
Fix Gradient doc snippet.
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
panel has been closed
Task-number:
Reviewed-by: Martin Jones
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-10999
Reviewed-by: Michael Brasser
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
TextEdit elements
Task-number: QTBUG-10841
Reviewed-by: Warwick Allison
|
| | | |/ / / |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The problem here is the fact that to test the mouse click the test
depended on some "magical" coordinates which are not valid anymore.
But since QTest::mouseClick(...) will target the center of the button,
there is no need to calculate coordinates.
Reviewed-by: Richard Moe Gustavsen
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits)
Dont crash when assigning the same input context twice.
Fixed a typo in variable name in qlocale data generator.
Fix for Norwegian and Korean languages on symbian.
Remove unused function in QDBusConnectionPrivate
Doc: Fixing bugs in HTML generator
Updating 4.7.0 change log.
Doc: Correcting style to class lists
qdoc: Improved class index page.
Added MSVC 2010 project files to .gitignore
Fix architecture detection on GNU/Hurd.
Revert "tst_bic: make it possible to test for cross-compilation"
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
Removing unneeded qDebug statement.
...
|
| | | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit b5f1a55c3112f46f27e2306fac7d93bde96152e6.
|
| | |\ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits)
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
Removing unneeded qDebug statement.
Fixing incorrect addition of public API symbols.
Removal erroneous inclusion of new Public API in qmacstyle.
Doc: design changes
qdoc: Fixed html error, but the problem is still there.
qdoc: Changed number of columns to 1. Oila!
Doc: Changes to the HTMLGenerator, style and js
remove dead code that will never get called.
add bytes and activeTime to corelwan.
Fix formating of license header.
fix irix build
clarify wording of warning message
...
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits)
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
Removing unneeded qDebug statement.
Fixing incorrect addition of public API symbols.
Removal erroneous inclusion of new Public API in qmacstyle.
Doc: design changes
qdoc: Fixed html error, but the problem is still there.
qdoc: Changed number of columns to 1. Oila!
Doc: Changes to the HTMLGenerator, style and js
remove dead code that will never get called.
add bytes and activeTime to corelwan.
Fix formating of license header.
fix irix build
clarify wording of warning message
...
|
| | | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits)
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
Removing unneeded qDebug statement.
Fixing incorrect addition of public API symbols.
Removal erroneous inclusion of new Public API in qmacstyle.
Doc: design changes
qdoc: Fixed html error, but the problem is still there.
qdoc: Changed number of columns to 1. Oila!
Doc: Changes to the HTMLGenerator, style and js
remove dead code that will never get called.
add bytes and activeTime to corelwan.
Fix formating of license header.
fix irix build
clarify wording of warning message
...
|
| | | | | |\ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/gui/styles/qmacstyle_mac.mm
|
| | | | | | | | | |
|
| | | | | |\ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Removed a change from the 4.7.0 change log.
Improve look and feel of itemviews on mac
doc: Fixed many broken links.
doc: Fixed many broken links.
update 4.7.0 changes
QPushButton's click area exceeds the button area by far on Mac OS X
QApplication::closeAllWindows() should ignore windows being closed
Examples: Fix compilation with namespace.
Use QApplication::arguments() to check for command line args
Added support for .rc files on VS2010.
Doc: Updating CSS and JS
Docs: added an intro for qml, Quick for Beginners.
Fix crash on exit in native wifi plugin on Vista+ when run in debugger.
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
It is very common to display a dialog in response to a close event.
Closing the window again will result in QWidget::close() returning true.
This confuses QApplication::closeAllWindows(), since the window is still
visible even though it was closed (or is closing). Solve this by
ignoring windows that have the is_closing flag set in their widget data.
Task-number: QTBUG-7635
Reviewed-by: Denis Dzyubenko
|
| |\ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|/ /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (22 commits)
Fix compilation of qegl.cpp after the last merge
Fix a race condition with QtDBus blocking for replies.
QtDBus: Debug message update
Removed DEPLOYMENT from demos/spectrum/spectrum.pro
Install source for spectrum demo
Fixed path for copying launcher script for spectrum demo
My 4.6.3 changes.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f )
Fixed an assert in QMenu
Backport multitouch bug fixes to 4.6
tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64
Call eglTerminate() when the last QEglContext is destroyed to free mem.
Removed double EINTR loop from nativeWrite and nativeRead.
Fixed qsslkey test deployment for Symbian and fixed compiler warnings.
Fixing the race condition in event dispatcher implementation on
changes-4.6.3 updated
Fixing the compile issue.
Fixing the compile issue.
Typo.
Removed nearest test from qaudiodeviceinfo unit test.
...
|
| | |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | /
| | | |_|_|_|_|/
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
demos/spectrum/app/app.pro
src/gui/egl/qegl.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qmenu/tst_qmenu.cpp
|
| | | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed an assert in QMenu
Call eglTerminate() when the last QEglContext is destroyed to free mem.
|
| | | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed an assert in QMenu
Call eglTerminate() when the last QEglContext is destroyed to free mem.
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
The code was changed and changed the behaviour. This is
basically a kind of revert.
Reviewed-By: gabi
Task-Number: QTBUG-10735
|
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
My 4.6.3 changes.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f )
tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64
|
| | | | |/ / / / / / / |
|
| | | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Aleksandar Sasha Babic
|
| | | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing the compile issue.
Fixing the compile issue.
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
We have to explicitely specify the include path to the MW headers
for Symbian. The compiler always gets confused if the private headers
get in the way.
Reviewed-by: TrustMe
|
| | | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by:Justin McPherson
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This reverts commit 2b3e7706f4459569520c77b9fb3ff2bc006e60f1.
|
