| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Try to use multisampled opengl graphicssystem on all platforms
Make sure recreateEglSurface creates a surface if there isn't one
QX11GL: Implement QX11GLWindowSurface::grabWidget
QX11GL: Cleanup the window surface & remove some synchronisation
QX11GL: Move the shared context ownership into a seperate class
QX11GL: Don't do glFinish in endPaint
Implement QGLPaintDevice::metric()
Remove dead code left after a merge conflict resolution
Fixed autotest failures in tst_QPainterPath.
Removed bezier intersection code in path clipper.
Diagram scene example (graphicsview/diagramscene) refresh problem.
When using Qt::BypassGraphicsProxyWidget with QMenu the application is not stuck anymore
|
| | |
| |
| |
| | |
Reviewed-By: Samuel
|
| | |
| |
| |
| |
| |
| |
| |
| | |
If QGLWidgetPrivate::recreateEglSurface is called after a surface
has been deleted, it should always create a new surface and ignore
the fact that the window ID may not have changed.
Reviewed-By: Trond
|
| | |
| |
| |
| |
| |
| | |
Now all the window surface autotests pass.
Reviewed-By: TrustMe
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously we were calling all manor of synchronisation calls to
make sure there were no issues. These have been sanitised to just
use eglWaitClient and eglWaitNative and only in places which need
it. There is still a bug where small updates will sometimes result
in small horizontal streaks. However, this has been confirmed to be
a cache flush bug in the X server 2D driver. The driver bug is
tracked in Meamo bugzilla as bug 164941. Hopefully it will be fixed
soon.
Reviewed-By: TrustMe
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This patch moves initialisation into a new QX11GLSharedContexts
class which is created as a Q_GLOBAL_STATIC. This class owns both
the RGB/ARGB EGL contexts and the QGLContext used for sharing.
Finally, the shared QGLContext is make a valid context wrapping the
RGB EGL context and a small pixmap surface. This makes the shared
QGLContext the QGLContextGroup master, so when it is deleted, it
can be made current to delete the GL resources. Among other benefits,
this patch stops apps seg-faulting when they gracefully quit.
Reviewed-By: TrustMe
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It's better to defer the synchronisation to just before the point it
is actually needed. When used as a window surface, this is in flush
and scroll. If the QX11GLPixmapData is used as the defaut backend
for QPixmaps, it might need to be put back into endPaint. However,
the GL driver will hopefully make sure rendering to the pixmap is
complete before binding it as a texture via texture-from-pixmap.
Also, it's probably better to use eglWaitClient rather than glFinish
for synchronisation as it is potentially slightly more optimal.
Reviewed-By: TrustMe
|
| | |
| |
| |
| | |
Reviewed-By: TrustMe
|
| | |
| |
| |
| | |
Reviewed-By: Kim
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The simplified test failed because the ellipse was flattened into line
segment. The other tests were due to a behavioral change in contains()
and intersect() caused by using fill based intersection in change
f7d61dab69308f0993c8a5f2232226d1713ac4a7. This needs to be reverted,
since it will return false for a rect containing a line (with no fill
area). Instead a different fix was needed in linesIntersect() to prevent
testIntersections() in tst_QPathClipper from failing.
Reviewed-by: Trond
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Removed bezier intersection code in path clipper.
Diagram scene example (graphicsview/diagramscene) refresh problem.
When using Qt::BypassGraphicsProxyWidget with QMenu the application is not stuck anymore
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The bezier intersections caused a lot of numerical stability issues, so
instead we now convert them to line segments. In the future it might be
possible to keep track of which bezier curve a line segment originated
from and reconstruct the bezier curves at the end.
Task-number: QTBUG-8035
Reviewed-by: Gunnar Sletta
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
stuck anymore
When using this flag the child of the widget which is embedded is becoming
a top level QWidget. So a right click on a text edit trigger the context
menu to be top level. When creating this top level context menu we are
grabbing the mouse but we were never releasing it when the menu was hidden.
The patch check if the widget uses the Qt::BypassGraphicsProxyWidget and
ungrab the mouse. The patch also fix a bug when positioning the QMenu, it was
for the same reason.
Task-number:QTBUG-7254
Reviewed-by:brad
|
| |\ \ \ |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
QDeclarativeExpression can be used to evaluate any sort of expression,
not just those returning a value.
|
| | | | | |
|
| | | | | |
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits)
Do not treat images in qml examples differently.
Replace Flickable overshoot property with boundsBehavior
Autotests and doc
Give error on attempt to import types from too-early version number.
Remove (undocumented) QML bindings for effects.
De-straighten them lines.
Doc: fix QStringList model doc (really).
Doc: fix QStringList model docs
Change return type to match value().
Add duration and easing properties to AnchorAnimation.
Autotest
Remove dead code
Compile on Windows (export decl fix).
Fix versioning of Qt Declarative's in-built types
Fixed declarative/parserstress autotest.
Fix parsing of regular expression literals.
Fill out QGraphicsLayout bindings
Update test files to new syntax
Compile without Qt3 support.
Ensure workerscript.qml works (autotested).
...
|
| | |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits)
Cocoa: fix namespace build breakage
Trivial doc fix
qdoc: Updated the extra images variable for each manual.qdocconf.
Cocoa: cocoa sometimes show a hidden window
Default (Parentless) QMenuBar actions do not work (without autotest)
Reorganised double stream out operator in QDataStream to avoid causing unnecessary floating point exceptions.
Revert "Report the error as being AlreadyExists if this is why it fails"
Revert "Default (Parentless) QMenuBar actions do not work"
fix memory bug
fix nativeFilePath character width issue
fix typos
Just use the path as the url can have an anchor attached etc...
Doc: Cleaning HTML generator and updating index.qdoc
Default (Parentless) QMenuBar actions do not work
Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCore
qdoc: Avoided putting bad chars in links
Improve itemview appearance on Mac
Backport a few fixes to the Designer filteredit from Creator
Doc: Correcting qdocconf files for assistant
ScrollBar width not updated dynamically on Windows.
...
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits)
Cocoa: fix namespace build breakage
Trivial doc fix
qdoc: Updated the extra images variable for each manual.qdocconf.
Cocoa: cocoa sometimes show a hidden window
Default (Parentless) QMenuBar actions do not work (without autotest)
Reorganised double stream out operator in QDataStream to avoid causing unnecessary floating point exceptions.
Revert "Report the error as being AlreadyExists if this is why it fails"
Revert "Default (Parentless) QMenuBar actions do not work"
fix memory bug
fix nativeFilePath character width issue
fix typos
Just use the path as the url can have an anchor attached etc...
Doc: Cleaning HTML generator and updating index.qdoc
Default (Parentless) QMenuBar actions do not work
Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCore
qdoc: Avoided putting bad chars in links
Improve itemview appearance on Mac
Backport a few fixes to the Designer filteredit from Creator
Doc: Correcting qdocconf files for assistant
ScrollBar width not updated dynamically on Windows.
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Cocoa would not build with namespace. This patch fix makes the day.
Reviewed-by: prasanth
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits)
Cocoa: cocoa sometimes show a hidden window
Default (Parentless) QMenuBar actions do not work (without autotest)
Reorganised double stream out operator in QDataStream to avoid causing unnecessary floating point exceptions.
Revert "Report the error as being AlreadyExists if this is why it fails"
Revert "Default (Parentless) QMenuBar actions do not work"
fix memory bug
fix nativeFilePath character width issue
fix typos
Just use the path as the url can have an anchor attached etc...
Doc: Cleaning HTML generator and updating index.qdoc
Default (Parentless) QMenuBar actions do not work
Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCore
qdoc: Avoided putting bad chars in links
Improve itemview appearance on Mac
Backport a few fixes to the Designer filteredit from Creator
Doc: Correcting qdocconf files for assistant
ScrollBar width not updated dynamically on Windows.
[tst_qhostinfo] Modify multipleDifferentLookups to repeat hostnames
[tst_qhostinfo] Properly clean up the cache and lookup threads.
Remove redundant network configuration updates on startup.
...
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If we tell the only window in an app to hide, deactivate the app, and
then activate it again, the window will show on screen (and be
unresponsive). The reason is that cocoa still sees the window as the
main window (and I cannot find a way to tell cocoa otherwise).
This patch works around the problem by hiding the window again if it
becomes main while being hidden.
Reviewed-by: msorvig
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This bug is a bit nasty. The problem is that Cocoa is trying
to be smart behind our back, and enable/disable menu items
depending on the menu item targets. But in Qt, we have a
different policy that Cocoa on when a menu bar should be
disabled or not. E.g. we allow a modal dialog to access the
application menu bar if it is the only window on screen.
This patch will work around cocoa being smart by setting the
menu item targets dynamically, depending on the modal state
of Qt. Setting it to nil will make the items enabled when there
is a modal dialog on screen, and setting it to the menu loader
will enable it when there is _no_ window on screen at all.
Task-number: QTBUG-9209
Reviewed-by: prasanth
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
unnecessary floating point exceptions.
Signed-off-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 73a1291a3f097787f00d79d0d27bd75219bf8e3d.
Test failures:
qsystemsemaphore::key (unix platforms)
All of qsharedmemory (unix, windows)
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 327fabf8e8819b199aa24912ffe6893020b465d4.
Test Failures:
macnativeevents::testMenuBarWorksForModalDialog (pulse_macx-g++_cocoa_32)
macnativeevents::testMenuBarWorksWithoutWindows (pulse_macx-g++_cocoa_32)
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
fixes using MallocScribble crash
Task-number: QTBUG-10068
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
the variable is a byte array, but it holds wchar_t's.
Reviewed-by: joerg
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This bug is a bit nasty. The problem is that Cocoa is trying
to be smart behind our back, and enable/disable menu items
depending on the menu item targets. But in Qt, we have a
different policy that Cocoa on when a menu bar should be
disabled or not. E.g. we allow a modal dialog to access the
application menu bar if it is the only window on screen.
This patch will work around cocoa being smart by setting the
menu item targets dynamically, depending on the modal state
of Qt. Setting it to nil will make the items enabled when there
is a modal dialog on screen, and setting it to the menu loader
will enable it when there is _no_ window on screen at all.
Task-number: QTBUG-9209
Reviewed-by: prasanth
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Cherry-picked from WebKit trunk.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This fixes two significant issues with the mac look and feel.
* Remove superfluous white inner border from item views.
This makes items fill all the way to the border.
* Remove double border for item view headers.
We now clip headers properly to make them blend with the
outer border.
Reviewed-by: Morten Sørvig
Task-number: QTBUG-10047
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Whenever the scrollbar width is changed in the system, Windows sends a
WM_SETTINGCHANGE message (with SPI_SETNONCLIENTMETRICS) to all toplevel
windows. This will now call updateGeometry() for all QScrollBar based
widgets and issue a new QEvent::LayoutRequest.
Task-number: QTBUG-9822
Reviewed-by: Jan-Arve
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Ensure that one test won't interfere with the next
Reviewed-by: Markus Goetz
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The initial list of network configurations was being fetched twice when
the bearer management plugins are loaded.
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
when possible
JSC::NativeFunctionWrapper is a typedef to either JSC::PrototypeFunction or
JSC::JSFunction depending if we are running JIT or not.
When using JIT, JSC::JSFunction is faster, as it allow JIT to do the native
call dirrectly. The difference is that in that case, the JS stack is not
fully set up so we have to be carefull.
Unfortunately, it is not possible to make FunctionWrapper inherit from
JSC::NativeFunctionWrapper, because JSFunction is slightly bigger, and we
cannot fit in a Cell
Reviewed-by: Kent Hansen
|
| | | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qdoc: Added online flag to the qdocconf file.
I10n: Update German translations for 4.7.0
Fix compile warning.
Report the error as being AlreadyExists if this is why it fails
move network scan to thread.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
On Windows it would never report this error, and on Unix it would
report a different error ulimately instead as it tried to obtain the
semaphore a second time which could cause a different error to what
should be reported.
Task-number: QTBUG-9610
Reviewed-by: Frans Englich
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
increases startup time.
Task-number: QTBUG-9722
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Michael Brasser
|
| | |_|_|_|_|/
|/| | | | | |
|
| |\ \ \ \ \ \ |
|
| | |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (131 commits)
Autotests and doc
Give error on attempt to import types from too-early version number.
Remove (undocumented) QML bindings for effects.
De-straighten them lines.
Change return type to match value().
Add duration and easing properties to AnchorAnimation.
Autotest
Remove dead code
Compile on Windows (export decl fix).
Fix versioning of Qt Declarative's in-built types
Fixed declarative/parserstress autotest.
Fix parsing of regular expression literals.
Fill out QGraphicsLayout bindings
Update test files to new syntax
Compile without Qt3 support.
Ensure workerscript.qml works (autotested).
Update strings in test
remove debugs
Make the dynamic creation functions on the Qt object
More focus example cleanup.
...
|
| | |\ \ \ \ \ \
| | |_|/ / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits)
Fixes wrong QGraphicsView's viewport cursor reset.
Optimize ~QObject
Document that QFileSystemWatcher needs to be destroyed before ~QCoreApp
Build fix for mingw
Fixes keyboard shortcuts for QGraphicsTextItem.
Optimize QMetaObject::activate
Benchmark emission of signal connected to nothing
Micro optimisations in QMutexLocker
Fixed assert failure when trying to load invalid SVG file.
Added QIcon::name()
QDialog: user-moved dialog would not show on the same place after hide
Fixed image drawing inconsistencies when drawing 1x1 images/subrects.
Fixed pixel-bleeding when stretching subrected pixmaps.
Fixed a crash when declaring an animation with Q_GLOBAL_STATIC
Add a test to QListView to check initialisation of style option index, similar to QTreeView test.
Odf export: Remove double namespace in tab-stops and fix table padding
Mac: Fix off-by-one in vertical position for elided and non-elided text
QX11GL: Fix bug with pixmaps drawn on multiple top-levels
Use QGLContextPrivate to track attribarray enabled state.
Don't crash when calling drawPixmapFragements with a null pixmap
...
|
| | | |\ \ \ \ \
| | | |_|/ / /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits)
Fixes wrong QGraphicsView's viewport cursor reset.
Optimize ~QObject
Document that QFileSystemWatcher needs to be destroyed before ~QCoreApp
Build fix for mingw
Fixes keyboard shortcuts for QGraphicsTextItem.
Optimize QMetaObject::activate
Benchmark emission of signal connected to nothing
Micro optimisations in QMutexLocker
Fixed assert failure when trying to load invalid SVG file.
Added QIcon::name()
QDialog: user-moved dialog would not show on the same place after hide
Fixed image drawing inconsistencies when drawing 1x1 images/subrects.
Fixed pixel-bleeding when stretching subrected pixmaps.
Fixed a crash when declaring an animation with Q_GLOBAL_STATIC
Add a test to QListView to check initialisation of style option index, similar to QTreeView test.
Odf export: Remove double namespace in tab-stops and fix table padding
Mac: Fix off-by-one in vertical position for elided and non-elided text
QX11GL: Fix bug with pixmaps drawn on multiple top-levels
Use QGLContextPrivate to track attribarray enabled state.
Don't crash when calling drawPixmapFragements with a null pixmap
...
|
