| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/minehunt/minehunt.cpp
src/declarative/qml/qdeclarativecompiler.cpp
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (26 commits)
Use canonical form for headers
Remove exporting of QDeclarativeContext class symbols
Remove non-existing header from pri file
Fix Loader crash.
Compile in namespace
Deprecate inline Script {} blocks
Update metaobjectbuilder version test.
Set role names for QFileSystemModel and QDirModel
Removed wrong parenthesis around property NOTIFY declaration
Remove dead performance measurement code from QML
Fix warning mentioned in the comments of QTBUG-9182.
Fix test.
Ensure positioner animations are triggered correctly
Fix qdeclarativeqt::createQmlObject autotest
Add MiddleButton = MidButton to MouseButtons enum.
Fix qdeclarativetextedit::delegateLoading autotest
Fix Behavior documentation due to easing changes.
Fix crash when calling createObject on a component with errors.
Initialize variable.
Produce an error when trying to create objects in a PropertyChanges.
...
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits)
Remove non-existing header from pri file
Fix Loader crash.
Compile in namespace
Deprecate inline Script {} blocks
Update metaobjectbuilder version test.
Set role names for QFileSystemModel and QDirModel
Removed wrong parenthesis around property NOTIFY declaration
Remove dead performance measurement code from QML
Fix warning mentioned in the comments of QTBUG-9182.
Fix test.
Ensure positioner animations are triggered correctly
Fix qdeclarativeqt::createQmlObject autotest
Add MiddleButton = MidButton to MouseButtons enum.
Fix qdeclarativetextedit::delegateLoading autotest
Fix Behavior documentation due to easing changes.
Fix crash when calling createObject on a component with errors.
Initialize variable.
Produce an error when trying to create objects in a PropertyChanges.
Fix Flipable crash.
Reduce amount of qmldir parsing
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-7479
Reviewed-by: Alexis Menard
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QElapsedTimer doesn't initialise itself on construction, which means we were
actually depending on uninitialised data. QTime does initialise itself to NullTime.
This means the test didn't actually work if you ran it precisely at midnight...
Reviewed-By: Trust Me
|
| |\ \ \ \ \
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (114 commits)
Fix the test of QDirIterator with NoDot and NoDotDot
Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot
QFSFileEngine: don't look through NTFS junctions
After showing modal windows, WM_LBUTTONUP for double click is ignored.
Possible fix for missing QML properties in the qt.qhp file.
Use standard theme icons in Linguist where possible
Use more standard icons from the theme in Assistant
Use more standard icons for standard actions in Designer
Drag & drop operations wont end while using Remote Desktop sessions
_close(fd) closes the associated handle and not the other way around
Fixed locale mapping on Symbian.
Revert change 7bf4512659 on Cocoa.
Extended the high_attributes array, since we have more than 127 widget attributes now.
Added instructions for MinGW users wanting to build the MySQL driver.
Designer: Fix broken resource view.
Add missing ,.
get rid of build warning messages
Quiet unnecessary configure/qmake warnings when EPOCROOT is not set.
Add configure test for Maemo Internet Connection Daemon.
fix warning
...
|
| | | | | | |
|
| | |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/itemviews/qabstractitemview.cpp
|
| | |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (92 commits)
Make QStackTextEngine cheaper to construct
Add a function to get the transitions available from a state
Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets (part 2).
Code cleaning for the QStringList's joinEmptiness() test case
Fix behavior change QStringList::join() for null
Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets.
Cocoa: fix eventdispatcher crash, found by macgui autotest
Make QWidget::activateWindow() NET window manager aware.
Upgraded QLocale data to Unicode CLDR 1.8.0
Improved CLDR parser.
Fixed reading draft data from CLDR.
Improved the cldr parser for QLocale.
Do not use FSEvents-based filesystemwatcher backend on Mac.
add file missing in commit 74f5e34979b8a08a91aa3c2fa6d252e68eca7817
Moc: Add support for rvalue references in signals and slots.
Add support for polyphonic greek
Fix build failure on WinCE.
Autotests: if you use X11 libs, you must link to X11 libs explicitly.
Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
Compile Phonon in C++0x mode.
...
|
| | | |\ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (75 commits)
Autotests: if you use X11 libs, you must link to X11 libs explicitly.
Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
Compile Phonon in C++0x mode.
Compile Qt in C++0x mode.
Avoid a data relocation by not trying to store a pointer in the .data section of plugins.
Fix cast-from-ascii warning
Fix compilation on Linux
Fix compilation with WINSCW: #include doesn't find files in the same dir
Rename m_volume to m_vol
Add 2 signals, introduce side widget, make it possible to reset startId
Do not create native window handle just because a parent has one.
Tab color fix for document mode on Snow Leopard.
Revert "Don't emit open signal on session close/error."
Rename networkAccess property to networkAccessible.
Don't emit open signal on session close/error.
Rename private signal.
Autotest: fix instability by accepting rounding errors
Dont force height for filter widget
- Fix importdir option on unix/linux configure
Remove incorrect semi-colons after Q_PROPERTY
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is not valid in C++0x:
char str[] = { 128, 0 };
Because 128 cannot be represented in a char. The same applies to
conversion from int to qreal: it's a narrowing conversion, with
possible data loss.
More info: http://www2.research.att.com/~bs/C++0xFAQ.html#narrowing
Reviewed-by: Trust Me
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (58 commits)
Dont force height for filter widget
- Fix importdir option on unix/linux configure
Remove incorrect semi-colons after Q_PROPERTY
10n: Update German translation for 4.7.0
Redesigned filter widgets
Add a test case for commit 76d767080a6be7b025f36d6778dfaedbd31a9f07
Add Japanese/Korean keyboard specific keys to QKeySequence
Fixed qmdiarea autotest regression on Cocoa
Fix JSC export macros
Minor update for f3f979cbd37f47892cd0c0a9fc23b802ed6f7890
Incorrect translation for Application menu items in Mac.
doc: Fixed use of Qt 3 support function in QIcon doc snippet
Build and run QElapsedTimer test.
Fix license headers.
Add flag to indicate that network sessions are expected on a platform.
Don't fail unit test when there is no default network configuration.
Make destructor virtual.
Optimized QLocale to access system locale on demand.
Remove unwanted code in f8d5f2594a9b268b9eeecf95b24b23fc940c71ce
Compile fix on keypad-navigation systems
...
|
| | | | | |\ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (46 commits)
Build and run QElapsedTimer test.
Fix license headers.
Add flag to indicate that network sessions are expected on a platform.
Don't fail unit test when there is no default network configuration.
Make destructor virtual.
Optimized QLocale to access system locale on demand.
Remove unwanted code in f8d5f2594a9b268b9eeecf95b24b23fc940c71ce
Compile fix on keypad-navigation systems
Force qt-zlib to be used for host system when cross compiling.
qmake: fix to create proper install target in Makefile at first run
compile fix for Windows
Fixed focus handling when Qt is embedded into Cocoa app.
Do not beep on Mac when pressing some keys.
Do not deliver the same key event multiple times in Cocoa.
Implement Idle-priority threads for Linux.
Improved qt_x11_wait_for_window_manager
Doc: document QElapsedTimer
Added missing "const" for mac.
qdoc3: Fixed some ifdef typos and removed some whitespace.
Manual test for QTBUG-8933.
...
|
| | | | | | |\ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (38 commits)
Force qt-zlib to be used for host system when cross compiling.
qmake: fix to create proper install target in Makefile at first run
compile fix for Windows
Fixed focus handling when Qt is embedded into Cocoa app.
Do not beep on Mac when pressing some keys.
Do not deliver the same key event multiple times in Cocoa.
Implement Idle-priority threads for Linux.
Improved qt_x11_wait_for_window_manager
Doc: document QElapsedTimer
Added missing "const" for mac.
qdoc3: Fixed some ifdef typos and removed some whitespace.
Manual test for QTBUG-8933.
Cocoa: minisplitter has only 1px wide grab area
"Strictly" Fullscreen Application in Mac OS
Bugfix the Symbian implementation
Add QDateTime::currentDateTimeUtc and QDateTime::currentMsecsSinceEpoch
remove, fixup
Change the 32-bit rollover on Windows and Symbian to be more efficient.
Add a couple of extra functions to QElapsedTimer
Autotest: Rename the test to match the new class name
...
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
When a key event is delivered to widgets, we should accept the event if the
widget reacted to it in any way - if either the current item has changed or if
the widget scrolled.
Task-number: QTBUG-6444
Reviewed-by: Prasanth
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | |_|_|_|_|_|_|/
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
When in QTreeView::dataChanged(), we didn't check for the actual
change in the value before setting
QTreeViewPrivate::defaultItemHeight. Hence, if uniformRowHeights is
true, we completely miss any resizing of the items.
Reviewed-by: Thierry
Task-number: QTBUG-9216
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-2804
Reviewed-by: ogoffart
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Ther was duplicated code and useless disconnections in the destructor
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
we don't need to calldoDelayedItemLayout, setting the flag that the
widget needs the item layout is enough
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Until now, the dropped position depended on the position of the middle
of the dragged header w.r.t. the hovered header. Now, it only depends
on the mouse cursor position and the middle of the hovered header,
closer to what happens on Windows or Mac OS.
Reviewed-by: Thierry
Task-number: QTBUG-6968
|
| | |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-8086
Reviewed-by: gabi
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If multiple proxies are connected to one source model which gets reset,
the order of execution of the sourceModelAboutToBeReset slots could cause
QPersistentModelIndexes to be invalidated in one proxy model before the
same slot is executed in the other proxy model.
Additionally, the persistent indexes in the QSFPM are invalidated before
the persistent indexes in the source model. This patch makes them
invalidated afterward now, which makes more sense.
Merge-request: 503
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It could beseen that not a full row was updated when moving the mouse
from the decoration to its attached item.
Reviewed-by: gabi
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When the number of selected items is large (a few thousands), the
computation of visualRegionForSelection can take a long time (up to a
few seconds). Analysis with valgrind shows that most of the time is
spent in miRegionOp (in qregion.cpp), which is being called by
QRegion::operator+=. The visualRegionForSelection virtual method being
called only to update the view after selection, we can safely ignore
those item's rectangles outside the viewport, thus both reducing the
number of calls to miRegionOp and the actual cost of each call.
This, however, introduces a behaviour change in
visualRegionForSelection, as the returned region will *not* contain
any rectangle *not* intersecting the viewport.
Reviewed-by: Thierry
Task-number: QTBUG-884
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since commit cd2afafbc9c29393a80d415145c49eb5f439da55, we are always
doing full relayout when adding or removing rows. So there is no point
of doing the expensive incremental update of the viewItems.
This has also the nice side effect to fix QTCREATORBUG-886
(see comment in the task)
Reviewed-by: Thierry
|
| |/ /
| |
| |
| |
| |
| |
| | |
This could happen if a section was moved andthen hidden
Task-number: QTBUG-8650
Reviewed-by: Andy Shaw
|
| |/
|
|
|
|
|
| |
That makes it consistent with the other models.
Task-number: QTBUG-8766
Reviewed-by: gabi
|
| |
|
|
|
|
| |
Fix typo in qabstractitemview.cpp
Reviewed-by: Thierry
|
| |
|
|
| |
This reverts commit 8e98c4c159c38ea48b6321674105762b2d3f517b.
|
| |
|
|
|
| |
Task-number: QTBUG-8270
Reviewed-by: gabi
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix a crash in QSortFilterProxyModel when deleting a row
small cleanup regarding delayed layout in itemviews
Fixed wasted space in the texture cache.
Get debug code compiling since function signature changes
--warn;
That file was forgotten when adding SSE support under mingw
|
| | |
| |
| |
| |
| |
| |
| | |
...while changing data.
Reviewed-By: gabi
Task-Number: QTBUG-8841
|
| | | |
|
| |\ \
| |/
|/|
| |
| | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| | |
We cannot use isIndexHidden in ScrollTo because that would return
true if the index is in a span.
Task-number: QTBUG-8777
Reviewed-by: Markus Goetz
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... by first looking around the last find item.
This was already done, but only for the 4 closest item. Now start
searching from the last index and continue.
Reviewed-by: Gabriel
Task-number: QTBUG-8886
|
| | |
| |
| |
| |
| |
| |
| | |
- use QHash instead of QMap
- use QVector::reserve when the size is known
Reviewed-by: Gabriel
|
| | |
| |
| |
| |
| |
| | |
Specially when called from expandAll
Reviewed-by: Gabriel
|
| | |
| |
| |
| |
| |
| |
| |
| | |
QVector::operator[] calls detach. and we should avoid calling it
in a loop.
QVector::at() cannot be used here because we need a non const reference.
Reviewed-by: Gabriel
|
| | |
| |
| |
| | |
Reviewed-by: Trust me
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When updating the QTreeViewItem::total field in layout(), we used to
call QTreeViewPrivate::viewIndex() to get the parent item, which is
O(n). We have now introduced 'parentItem' in QTreeViewItem wich makes
this O(1), with a small penality when inserting and removing elements
in QTreeViewPrivate::viewItems.
The QTreeViewPrivate::checkViewItems() is left inside the code for
further debugging.
Reviewed-by: Olivier
Task-number: QTBUG-8885
|
| | |
| |
| |
| |
| |
| |
| | |
That is required for the Locals & Watchers view in Creator.
Task-number: QTBUG-7115
Reviewed-by: Thierry
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When computing the region from the selection range, we didn't take
care of the actual position of the cells, which is reverted when in
RtoL mode. Also gets fixed a 2-pixel error introduced in commit
718905c097a7f3bbf9805a2561cd855a0b2d8f59, and that was responsible for
(potentialy) painting more cells than needed.
Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-7774
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
child
While setting the hasChildren property of QTreeViewItem, "collapsed" and
"not visible" were being mistaken.
Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-7443
(cherry picked from commit 77670c3c0fdc3021356e212e94042a0b5a4f4f8c)
|
| | |
| |
| |
| |
| |
| | |
After a mess-up by git rebase...
Reviewed-by: ogoffart
|
