| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\ |
|
| | |
| |
| |
| | |
Provides more control over where and how the view is positioned.
|
| |/
|
|
| |
Task-number: QT-2846
|
| |\ |
|
| | |\ |
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (42 commits)
Remove more accidentally submitted code
Comment out unused method.
Document - and use - the qmlRegisterXXX template functions
when loading debug import plugins on Mac, try with _debug.dylib suffix
fix inclusion of qt_targets.pri in qimportbase.pri
Use TARGETPATH instead of hardcoding locations
Fix location in which webkit import is stored in builddir
Oooops --- revert wrong commit
Doc
Remove accidentally submitted code
Ensure currentIndex NOTIFY is emitted when currentIndex changes due to model change.
Unify binding optimizer and QtScript binding signal management logic
Schedule view relayout after itemsInserted/Removed()
Use no-version-specified to mean any version (used to work, fixed again,
URL redirection for font loader
URL redirection for AnimatedImage
Technically, Location can be relative (never is though...)
URL redirection for normal images.
URL redirection for components resources.
URL redirects for border image.
...
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Slow QTreeView::layout() with many (> 10000) children
Fixed "inconsistent dll linkage" warning on Windows.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
qt_memrotate90() was declared twice, once with and once without
Q_GUI_EXPORT.
Reviewed-by: Trond
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QT-2825
|
| | |_|/
|/| | |
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/qml/qdeclarativepropertycache.cpp
src/declarative/qml/qdeclarativepropertycache_p.h
|
| | | | |
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (39 commits)
Document - and use - the qmlRegisterXXX template functions
when loading debug import plugins on Mac, try with _debug.dylib suffix
fix inclusion of qt_targets.pri in qimportbase.pri
Use TARGETPATH instead of hardcoding locations
Fix location in which webkit import is stored in builddir
Oooops --- revert wrong commit
Remove accidentally submitted code
Ensure currentIndex NOTIFY is emitted when currentIndex changes due to model change.
Unify binding optimizer and QtScript binding signal management logic
Schedule view relayout after itemsInserted/Removed()
Use no-version-specified to mean any version (used to work, fixed again,
URL redirection for font loader
URL redirection for AnimatedImage
Technically, Location can be relative (never is though...)
URL redirection for normal images.
URL redirection for components resources.
URL redirects for border image.
Implement URL redirection for types and XmlListModel.
Doc
Link with the correct library for TCommDbConnPref
...
|
| | | |
| | |
| | |
| | | |
This commit removes the obsolete QML_REGISTER_TYPE macros.
|
| | | | |
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (37 commits)
fix inclusion of qt_targets.pri in qimportbase.pri
Use TARGETPATH instead of hardcoding locations
Fix location in which webkit import is stored in builddir
Oooops --- revert wrong commit
Remove accidentally submitted code
Ensure currentIndex NOTIFY is emitted when currentIndex changes due to model change.
Unify binding optimizer and QtScript binding signal management logic
Schedule view relayout after itemsInserted/Removed()
Use no-version-specified to mean any version (used to work, fixed again,
URL redirection for font loader
URL redirection for AnimatedImage
Technically, Location can be relative (never is though...)
URL redirection for normal images.
URL redirection for components resources.
URL redirects for border image.
Implement URL redirection for types and XmlListModel.
Doc
Link with the correct library for TCommDbConnPref
Remove unused struct
update Browser.qml to run again
...
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Roberto Raggi
|
| | | | | |
|
| | | | | |
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/declarative/util/qdeclarativestateoperations.cpp
|
| | | | | | |
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Re-enable tst_QGL::glWidgetRenderPixmap on X11/EGL
Added clipping to the dashed stroke processor in the GL2 engine.
Fixed assert failure when drawing dashes with raster engine.
Update tst_QGL::getSetCheck to check for new (correct) behaviour
Update QGLFormat from EGLConfig properly
Make calls to QGLFormat::set*BufferSize also update flags
Compile fix when Qt3Support is enabled for devices using EGL.
Cocoa: Fix misaligned text between format changes
Added configure check to diasable building QtDeclarative
Fixes Q3ListViewItem grandchildren not sorted if item has one child
Compile with Qt3Support in a ScratchBox environment.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QGLWidget::renderPixmap now works under X11/EGL. Tested on both
Fremantle and Harmattan.
Reviewed-By: TrustMe
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Without clipping, the stroker could consume a huge amount of
memory when scaling up cosmetic, dashed strokes. I also made
QDashStroker clip more aggressively.
Task-number: QTBUG-7832
Reviewed-by: Samuel
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Samuel
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: Trond
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Previously, some members of QGLFormat (like alphaBufferSize) would
be left to the initial -1 value.
Reviewed-By: TrustMe
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: Trond
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Samuel
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
when Qt is not building the QtScript module
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Q3ListViewItem::sortChildItems() used to exits early if there is only 1 child
item and leaves grandchildren unsorted.
Merge-request: 2260
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| | | | |/ / /
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Tom Cooksey
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts part of commit e008504b5ec34975e34adf3b1a2b7170d0e4dd38.
The original commit aimed to round up all fractional numbers for the
font to "improve appearance". Rounding up the last advance of a set
of advances in a glyph layout, however, breaks text layout completely,
since the layout of text will be different depending on how many text
lines is used to represent it (since the last glyph in each line will
have a higher advance than the others.) This was e.g. visible in
Qt Creator when turning on whitespace visualization, as all spaces
then created a format change, thus a new text line in the text layout,
and hence an increase of X pixels in the positioning of the text after
the space, where 0.0 < X < 1.0. I see no negative results of removing
the rounding, but if there are any problems, it has to be fixed in the
usage of the advances not in the advances themselves.
Task-number: QTCREATORBUG-381, QTBUG-8791
Reviewed-by: mae
|
| | |\ \ \ \ \
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Update def files for latest QtDeclarative API
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The QDeclarativeBinding API is new since last week's freeze.
Froze the def files again, so that applications that use this API will be
able to link.
Task-number: QTBUG-8909
Reviewed-by: Trust Me
|
| | |\ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
MAke the SIMD fiunctions be used even when the QT_NO_DEBUG macro is used
Make sure 16-bit EGL configs are chosen over 32-bit configs
Make the EGL contexts in QX11GLPixmapData Q_GLOBAL_STATIC
Handle EGLSurfaces better, including more error detection
Make sure pixmap hooks get installed so EGL surfaces are cleaned up
Don't show resize cursor for fixed-size windows
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Benjamin Poulain
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We want to make sure 16-bit configs are chosen over 32-bit configs as
they will provide the best performance. The EGL config selection
algorithm is a bit stange in this regard: The selection criteria for
EGL_BUFFER_SIZE is "AtLeast", so we can't use it to discard 32-bit
configs completely from the selection. So it then comes to the
sorting algorithm. The red/green/blue sizes have a sort priority of
3, so they are sorted by first. The sort order is special and
described as "by larger _total_ number of color bits.". So EGL will
put 32-bit configs in the list before the 16-bit configs. However,
the spec also goes on to say "If the requested number of bits in
attrib_list for a particular component is 0, then the number of bits
for that component is not considered". This part of the spec also
seems to imply that setting the red/green/blue bits to zero means
none of the components are considered and EGL disregards the entire
sorting rule. It then looks to the next highest priority rule, which
is EGL_BUFFER_SIZE. Despite the selection criteria being "AtLeast"
for EGL_BUFFER_SIZE, it's sort order is "smaller" meaning 16-bit
configs are put in the list before 32-bit configs. So, to make sure
16-bit is preffered over 32-bit, we must set the red/green/blue
sizes to zero. This has an unfortunate consequence that if the
application sets the red/green/blue size to 5/6/5 on the QGLFormat,
they will probably get a 32-bit config, even when there's an RGB565
config avaliable. Oh well.
Reviewed-By: TrustMe
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Still not ideal, but this should do for now.
Reviewed-By: TrustMe
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Note: This changes QX11PixmapData::gl_surface to a void* to enable
build on 64-bit systems where EGLSurface is a pointer.
Reviewed-By: TrustMe
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: TrustMe
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-8144
Reviewed-by: Jørgen Lind
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits)
Don't wait forever when scanning for wifi networks on win32 fails.
Revert 12b6987031be9faee3886d7623888feb4e1762af
Changed TEST_COMPILER from CC to CXX in configure script.
doc: Fixed several qdoc errors.
Carbon: Native filedialog does not apply filters on app-bundles
Cocoa: Native filedialog does not apply filters on app-bundles
Improve performance of QTimer::singleShot
Add a benchmark comparing single shot timer with invokeMethod
use Qt's private mac functions, reduce code redundancy
Assistant: Fix compile warning for empty header.
Doc: mark QEasingCurve support functions as new in 4.7.
Modify the XML test suite not to use non-characters.
Autotest: Fix failing QTextCodec tests
Doc: mark methods as internal (as they were in previous releases)
Doc: add image for Qt Quick to "What's New" page.
qdoc: Clear a static multimap after each qdocconf file.
qdoc: Added some debug output to track down a crash
Fixed mouse wheel handling in scrollareas.
Added two missing keys for X11
Carbon: usage of menu bars can cause exceptions to be thrown
...
|
| | | | | | | | |
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (82 commits)
Revert 12b6987031be9faee3886d7623888feb4e1762af
Changed TEST_COMPILER from CC to CXX in configure script.
doc: Fixed several qdoc errors.
Carbon: Native filedialog does not apply filters on app-bundles
Cocoa: Native filedialog does not apply filters on app-bundles
Improve performance of QTimer::singleShot
Add a benchmark comparing single shot timer with invokeMethod
use Qt's private mac functions, reduce code redundancy
Assistant: Fix compile warning for empty header.
Doc: mark QEasingCurve support functions as new in 4.7.
Modify the XML test suite not to use non-characters.
Autotest: Fix failing QTextCodec tests
Doc: mark methods as internal (as they were in previous releases)
Doc: add image for Qt Quick to "What's New" page.
qdoc: Clear a static multimap after each qdocconf file.
qdoc: Added some debug output to track down a crash
Fixed mouse wheel handling in scrollareas.
Added two missing keys for X11
Carbon: usage of menu bars can cause exceptions to be thrown
Mac: compile fix
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The CI system found lots of focus-related
regressions, this is probably the offending change.
(I can't reproduce the regressions locally.)
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
We are using a cpp file for testing the compiler. Because of that we
have to use a c++ compiler for the test as well.
But if there was a CC variable defined, this one was used instead
of CXX for the compiler test.
This resulted in a missing QMAKE_LFLAGS definition in .qmake.cache.
Due to this, the -L/path/to/QTDIR/lib was missing too and
assistant could not be linked to libQtCLucene.so.4.
Reviewed-by: Marius Storm-Olsen
Task-number: QTBUG-8808,QTBUG-5471,QTBUG-5385,QTBUG-5774
|
