| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix compilation issue for the Carbon build.
|
| | |
| |
| |
| |
| |
| | |
The unified toolbar with the raster engine is
Cocoa specific.
Reviewed-by: Samuel Rødal
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (22 commits)
Fix bearermonitor when building for Maemo in scratchbox.
The lastCenterPoint should be equal to centerPoint for new gestures.
PinchGesture: lastRotationAngle should start at 0.
tst_qnetworkreply: Add testcase for unknown authentication method
QNAM: Reset authenticator state properly between requests
msvc: enable unreferenced code elimination in release with debuginfo builds
exclude headers in builddir from -copy option
more elegant treatment of qconfig.h special case
qdoc: Added next and previous links to top of pages.
Doc: style tuning
Doc: fixing style - tool buttons to bold.
Doc: updating the template to support search feature better.
Doc: Fixing columns to display all elements in lists - css3
simplify recursive symlinking
Doc: fixing bugs in style
Doc: fixing style for search display and slim fit menus
Doc: Fixing bug in sorting script for search results.
Doc: Fixed basic language.
Doc: Added Windows Vista to the trademark list.
Doc: Updated the Java trademark information.
...
|
| | |\ |
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
The lastCenterPoint should be equal to centerPoint for new gestures.
PinchGesture: lastRotationAngle should start at 0.
tst_qnetworkreply: Add testcase for unknown authentication method
QNAM: Reset authenticator state properly between requests
msvc: enable unreferenced code elimination in release with debuginfo builds
exclude headers in builddir from -copy option
more elegant treatment of qconfig.h special case
simplify recursive symlinking
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Zeno Albisser
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Zeno Albisser
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
qdoc: Added next and previous links to top of pages.
Doc: style tuning
Doc: fixing style - tool buttons to bold.
Doc: updating the template to support search feature better.
Doc: Fixing columns to display all elements in lists - css3
Doc: fixing bugs in style
Doc: fixing style for search display and slim fit menus
Doc: Fixing bug in sorting script for search results.
Doc: Fixed basic language.
Doc: Added Windows Vista to the trademark list.
Doc: Updated the Java trademark information.
Doc: Moved QFileSystemModel example code to the class documentation.
Doc: Corrected the name property as it was incorrectly declared.
|
| | | | |\ \
| | | | |/ |
|
| | | | |\ \ |
|
| | | | |\ \ \ |
|
| | | | |\ \ \ \ |
|
| | | | |\ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Previously, the code showed how to use QDirModel and was included in
the QDirModel class documentation, but it has since been changed to use
QFileSystemModel instead.
|
| |/ / / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
the unified toolbar on Mac OS X.
Task-number: QTBUG-12818
Reviewed-by: Samuel Rødal
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Qt/Symbian: QInputDialog layout and size are wrong
make the dtd reflect reality
Fixed destination path for the S60 feedback plugin.
german translation: minor additions + fixes
fix qdoc doc generation
|
| | |\ \ \ \ \ \ \ \
| | |/ / / / / / / |
|
| | | | |_|_|_|_|/
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The QInputDialog with anything but QLineEdit as the input widget,
will show up as minimal size on device/emulator. Also, the dialog
looks bad since the widgets are deployed very close to the dialog
borders.
As a fix, layout will not get the size policy set on Symbian, but
the dialog itself is stretched to occupy screen width and thus, layout
grows to occupy the available size. Additionally, style will set layout
pixel metrics for dialogs larger than for other widgets, to avoid
the layout from putting widgets very close to dialog border.
Task-number: QTBUG-14331
Reviewed-by: Janne Anttila
|
| |\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (55 commits)
Fix tst_collections::insert_remove_loop on 32bit
Fix warnings with clang
Add member-swap to shared datatypes that don't have it.
Containers: add member-swap
Fix license headers
Put more platform info in the report headers
QVarLenghtArray: Implement more API from QVector
Fixed index type after reapplying commit 89cbb165.
Reapply "Fixed painter path drawing on FBO without stencil buffer."
Fixes: Reading and writing PNG iTXt international text chunks
Fixes: corruption of whitespace in text fields when reading PNG images
Clean up some comments
Fixes unstability caused by a dangling pointer in GL text rendering
Fix getting git info on Win
Remove historic remains of qt3 testing
Testing auto-rebuild on server
Another change for running on actual server
Preparations for running on actual server
Add OS and git data to PlatformInfo
Revert "Don't define highp/mediump/lowp if desktop GL has them"
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
For consistency.
Merge-request: 871
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Member-swap is required by the STL Sequence concept, but is also needed to write exception-safe code.
Merge-request: 871
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | |\ \ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Kim
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-14398
Reviewed-by: Kim
|
| |\ \ \ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | / / / / / /
| | |/ / / / / /
| |/| | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-10538
Reviewed-by: Trust Me
|
| | | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-13714
Reviewed-by: Trust Me
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Blending / blitting of images without an alpha-channel gives the same
result with CompositionMode_Source and CompositionMode_SourceOver.
Task-number: QTBUG-14901
Reviewed-by: Kim
|
| |\ \ \ \ \ \ \
| |/ / / / / / |
|
| | |\ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | | |
Conflicts:
tests/auto/qpainter/tst_qpainter.cpp
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Don't take for granted that these are included...
Task-number: QTBUG-14614
Reviewed-by: Bradley T. Hughes
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
We need to protect the gradient cache accesses with a mutex.
Task-number: QTBUG-14614
Reviewed-by: Bradley T. Hughes
|
| |\ \ \ \ \ \ \
| |/ / / / / / |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When an application requests more graphics memory, the GOOM monitor
will start looking for other applications to kill in order to recover
the requested graphics memory. The first step in this process is to
send a custom event to the application indicating that it is a
candidate for termination. If the application does not acknowledge this
event, it will be killed immediately. However, since Qt releases its
graphics memory when the app is obscured, we should indicate that we
handle this event such that Qt has a chance to finish freeing
resources. If after a certain time, the app has not freed its resources
it will be killed anyway. This essentially buys Qt some time to
avoid the case where Qt apps are killed while they are cleaning up.
Task: QTBUG-14858
Reviewed-by: Jani Hautakangas
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Currently tactile feedback is not given for QWidgets running on Symbian
even if the native side supports this (Sym^3 and 5th Edition devices).
This task adds support for QWidgets having QS60Style. The tactile
feedback has been implemented as a plugin that the style loads when
instantiating itself for touch devices. NOTE that the feedback
is NOT supported by the emulated style, nor is the plugin interface
public, so it cannot be used outside of style.
The implementation is simplistic, since we only want to provide
stop-gap solution until 4.8 when real Qt feedback implementation
is ready. The implementation will only give feedback for touch-down
events for visible, interactive and enabled widgets. Sliders and
scrollbars will use sensitive feedback (slightly less aggressive)
and all others will use basic feedback. Note that Sym^3 adds tens
of different feedback categories, which this plugin ignores
as we want to share the same implementation for Sym^3 and 5th ed.
In distributed Qt package there is no tactile feedback for 5th edition,
due to package creation limitations. Support can be added manually by
re-compiling Qt on top of 5th Edition SDK.
Task-number: QT-4037
Reviewed-by: Jani Hautakangas
Reviewed-by: Janne Koskinen
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The qml debugging enabler in QtDeclarative made any Qt app crash
which used QDeclarative. Reason was that QtDeclarative.dll tried
to directly access (private) writable static data from QtGui.dll.
This patch adds an accessor function for the data to QtGui, and
the crash is gone.
Done-by: Kai Koehne
Reviewed-by: Kai Koehne
Conflicts:
src/declarative/debugger/qdeclarativedebugservice.cpp
|
| | | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QClipboard now returns copied data outside TRAP to prevent TRAP levels
to get crossed.
Task-number: QTBUG-14790
Reviewed-by: Janne Koskinen
Merge-request: 897
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
|
| |\ \ \ \ \ \
| |_|_|/ / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into master-integration
* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (388 commits)
Fix the license in files for Lighthouse
Fix typos found by the spellchecking autotest
Add missing QT_MODULE macros.
Fix qt_defaultDpi, but not use Q_DECL_IMPORT but Q_GUI_EXPORT
Compile fix for RVCT 4
Fix QT_BLITTER_RASTEROVERLAY and namespace error
Lighthouse: initial COCOA plugin
Lighthouse on OS X.
Fix QWS generic mac mkspec
actually set egl swap interval
Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0
Update sections if model content changes.
Don't clobber the tty by default
Add touch offset
Jitter removal
Mouse event compression
Add keycodes for some additional multimedia keys
Make it possible to choose some EGLFS configuration options via envvars
use swapInterval=1 by default in EglFS to potentially avoid tearing
Lighthouse: make QFontconfigDatabase not override application font
...
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: paul
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/corelib/global/qglobal.h
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/opengl/qwindowsurface_gl.cpp
|
| | |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/text/qfontengine_ft.cpp
|
| | |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: Jørgen
|
| | | | | | | | | | | |
|
| | |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
src/gui/painting/qpdf.cpp
|
