| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
This supports the (documented) case when mixing Qt built without
exception support with code that was built against Qt with exception
support.
Reviewed-by: Robert Griebl
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix the WebKit build
Blinking cursors are 2 pixels wide on Mac OS X/Cocoa.
Fixed compilation with QT_NO_WHEELEVENT
Take into account the solaris-cc-64-stlport mkspec
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ffae5e11181a3961193fa21ea405851cad714d4b )
|
| |
| |
| |
| | |
Reviewed-by: Simon Hausmann
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make generate uid3 (symbian) work on 64 bit host platform.
Updated the docs for QPainter::begin/endNativePainting()
Compile fix for network benchmarks.
Add a pixmap modification hook to blur pixmap filter cache
Delete benchmark examples (qtestlib-simple and qtwidgets).
Restructure tests/benchmarks directory.
Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.
QLineEdit: regression: read-only line edits would eat shortcuts.
QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
Make QTextCodec reentrant.
|
| |
| |
| |
| |
| |
| |
| | |
QTextCodec::codecForName and codedForMib were not reentrant
Reviewed-by: Brad
Reviewed-by: Denis
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixes scrolling horizontally with a mouse wheel over sliders.
Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
A fix for accidently reused variable names in nested iterations.
Iain's changes for 4.6.2
Doc: Fixed typo.
|
| |
| |
| |
| | |
Reviewed-by: Peter Hartmann
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (49 commits)
Fixed qt_x11_wait_for_window_manager
Revert change 34f1758 on non-Synbian platforms
Fixed QGifHandler::loopCount().
Fix tst_QAccessiblity failure.
fix compile error when linuxinput keyboard driver is compiled as plugin
Fixed the context menu test case in the qgraphicsscene autotest.
fix regression from Qt 4.5 wrt missing text pixels in QTabBar
Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown"
Cleanup after "QGraphicsWidget is painted twice on the first show"
Changed qgraphicswidget autotest to use qWaitForWindowShown.
Improved QTest::qWaitForWindowShown on X11.
Stabilize tst_QGraphicsWidget::initialShow2 (new test)
Make sure we define S_IFDIR on Windows
Fix copy/pasto
Crash when closing any top-level widget on Symbian.
Cache the sizes of the images in an animated GIF.
Fix the QAbstractSlider autotest.
Use OpenVG scissor on 90/180/270 rotations and simple clips.
Optimize single-rect IntersectClip in OpenVG using the scissor
QGraphicsWidget is painted twice on the first show.
...
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits)
Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown"
Cleanup after "QGraphicsWidget is painted twice on the first show"
Changed qgraphicswidget autotest to use qWaitForWindowShown.
Improved QTest::qWaitForWindowShown on X11.
Stabilize tst_QGraphicsWidget::initialShow2 (new test)
Make sure we define S_IFDIR on Windows
Fix copy/pasto
Crash when closing any top-level widget on Symbian.
Cache the sizes of the images in an animated GIF.
Fix the QAbstractSlider autotest.
Use OpenVG scissor on 90/180/270 rotations and simple clips.
Optimize single-rect IntersectClip in OpenVG using the scissor
QGraphicsWidget is painted twice on the first show.
Compiler warning in QAbstractSlider.
Optimize QPathClipper::pathToRect.
QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible.
QStyleSheetStyle: Fix combinaison of border-image and border-radius
Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal scrollbar"
Proper Fav icon is not shown, for all the links default fav icon shown
Update changes-4.6.2.
...
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Manual resolve of conflict in changes-4.6.2 in staging-2.
Conflicts:
dist/changes-4.6.2
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
dist/changes-4.6.2
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (29 commits)
Compiler warning in QAbstractSlider.
Optimize QPathClipper::pathToRect.
QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible.
QStyleSheetStyle: Fix combinaison of border-image and border-radius
Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal scrollbar"
Proper Fav icon is not shown, for all the links default fav icon shown
Update changes-4.6.2.
Make DSFLIP_ONSYNC part of the default flip flags.
Fixed a failure in tst_qgl.
4.6.2 changes
Avoids a possible crash when saving the state of a main window
Implemented QGifHandler::imageCount().
Fixed compilation of the GL2 engine for OpenGL ES 2.
fix whitespace
Document that QModelIndex::child does not work for the root item
Fixed missing textures in the boxes demo.
Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux
Assert failure when setting a widget focus proxy as its successor in tab order
Fixed garbled 3D Qt logo in the overpainting example.
fix crash in Phonon::DS9 backend
...
|
| | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits)
Fixed a failure in tst_qgl.
4.6.2 changes
Avoids a possible crash when saving the state of a main window
Implemented QGifHandler::imageCount().
Fixed compilation of the GL2 engine for OpenGL ES 2.
fix whitespace
Document that QModelIndex::child does not work for the root item
Fixed missing textures in the boxes demo.
Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux
Assert failure when setting a widget focus proxy as its successor in tab order
Fixed garbled 3D Qt logo in the overpainting example.
fix crash in Phonon::DS9 backend
Don't crash when running Qt on KDE with Oxygen style.
Fixes missing update when setting opacity on an item that had opacity 0.0
Avoids missing opacity updates by not propagating the ignoreOpacity flag
Cleanup in graphicsitem autotest
Adds convenience functions QGraphicsItemPrivate::isOpacityNull
Fixed a crash when QPixmaps are destroyed after the ~QApplication.
Fix GL texture leaks when pixmaps are deleted
Doc fix. No need to put something deprecated if it's not.
...
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Thierry
|
|/ / / / / /
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: hjk
|
|\ \ \ \ \ \
| |/ / / / / |
|
| |\ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Adjust rw base address for gui built with GCCE for Symbian OS
Added descriptions of translatable strings for Phonon MMF reverb effect
Corrected namespace for Phonon::MMF translatable error strings
Compile fix for non-Symbian compilers
S60 softkey refactoring (support for merging, priorities and menus)
Daylight savings time for Symbian take 2
|
| | |\ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Adjust rw base address for gui built with GCCE for Symbian OS
Added descriptions of translatable strings for Phonon MMF reverb effect
Corrected namespace for Phonon::MMF translatable error strings
Compile fix for non-Symbian compilers
S60 softkey refactoring (support for merging, priorities and menus)
Daylight savings time for Symbian take 2
|
| |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed QFileInfo::absolutePath() warning when running "qmake -project"
QTcpServer: Clarify thread affinity of incoming QTcpSocket
Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.
Updated my changelog entry
QNAM HTTP: Fix bug related to re-sending a request
Adding my changes.
Remove erroneous warning in QFileInfo::absolutePath()
|
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Added the "(QGraphicsSceneDragDropEvent)" behind the documentation of
the QGraphicsSceneDrag*-type events. Without this hint it gives the
impression that you can't access the data being dragged within
eventFilter()s.
Task-number: QTBUG-7547
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
this is a public function, so changing its semantics is no option. in
fact, it broke qmake on windows (for symbian-abld and wince50smart).
Reviewed-by: joerg
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant examples: Fix missing QLatin1String.
Added Czech translations.
Webkit: Fix missing namespace.
qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN
qmake: fix warnings
qmake: Remove macro and simplify string expression previously using it
qmake: use isActiveConfig() instead of hand-crafting comparisons
Fix missing namespace.
Assistant: Fix spelling mistakes.
Assistant: Use const references in foreach loops.
optimization: get rid of QString::fromUtf16() usage
document QString::fromUtf16() slowness
remove duplicated calculation of length
remove pointless conditionals
micro-optimization
optimize qhash()
Designer/uic/related examples: Fix source code scanning issues II.
|
| | |\ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN
qmake: fix warnings
qmake: Remove macro and simplify string expression previously using it
qmake: use isActiveConfig() instead of hand-crafting comparisons
Fix missing namespace.
Assistant: Fix spelling mistakes.
Assistant: Use const references in foreach loops.
optimization: get rid of QString::fromUtf16() usage
document QString::fromUtf16() slowness
remove duplicated calculation of length
remove pointless conditionals
micro-optimization
optimize qhash()
Designer/uic/related examples: Fix source code scanning issues II.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QString::fromUtf16() is slow - it does a BOM check and optionally byte
swapping, which is utterly pointless when converting internal data
structures which are raw utf16 in host byte order anyway. so replace
it with QString::fromRawData() (for short-lived strings) or
QString(const QChar *, int) (otherwise) if possible.
Reviewed-by: axis
Reviewed-by: mariusSO
Reviewed-by: Bill King
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
we already know that (endian == DetectEndianness) - we tested it 1 resp
3 lines above ...
Reviewed-By: denis
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
move up the headerdone setting, so the compiler can do tail-merging of
the branches
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
on any modern architecture, an 1 out of 16 times needlessly executed
shift (even if a long one) and xor are less expensive than a pretty much
randomly 1 out of 16 times differently taken conditional jump. so simply
remove the conditional. ~15% faster on Core2.
Reviewed-by: joao
|
| |_|_|/
|/| | |
| | | |
| | | | |
This reverts commit 7bc18035816a2eac15dfac4d987eb9bf43f90ef6.
|
|\ \ \ \ |
|
| |\ \ \ \
| | |/ / / |
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed def files on Symbian.
Added some missing documentation.
Fixed text rendering via scaled QPainter on rasterPaintEngine / Symbian
Documented limitations of add/setLibraryPath(s) on Symbian OS
Deployed QtMultimedia.dll on Symbian
Fixed the URL of known issues wiki page in docs
Fixing benchmark to be runnable on Symbian device
Fixing test to be runnable on Symbian devices.
Fixed no-timeout case for QProcess::waitForFinished in Symbian
Add visibility-inlines-hidden for GCCE on Symbian OS
Catch by reference rather than by value
Fixing benchmark for Symbian
Remove warning about Symbian DEF files when running configure for Windows
List item margins are too small due to invalid pixel metric value
Remove left over forward declarations
Avoided the loss of preedit text when losing focus on Symbian.
Added support for ifdeffing for manufacturer in generated pkg files
Shortening and fixing previous fix for QTBUG-6371
Update default FPU flags on Symbian to be softvfp+vfpv2
Using RunFast mode for RVCT
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Symbian OS limits applications to loading libraries only from /sys/bin
directory, so user defined library paths can only be useful for
locating Qt extension plugin stubs.
Task-number: QTBUG-7517
Reviewed-by: Janne Koskinen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QProcess::waitForFinished was panicking in Symbian when timeout of -1
was supplied. Fixed it to disable timeout and block until process
exit, as docs indicate it should.
Task-number: QTBUG-7667
Reviewed-by: Janne Anttila
|
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Catching by value causes GCC to use the compiler support function
__cxa_get_exception_ptr. This is not available in the compiler support
libraries on Symbian OS prior to Symbian^3. Catching by reference
avoids this problem.
Reviewed-by: mread
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
By checking the define before setting it, it ensures that its not
set to one that is actually lower than the value currently set to.
Reviewed-by: kkoehne
|
| | |
| | |
| | |
| | | |
Reviewed-by: Peter Hartmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Implemented features:
Softkey Merging:
Widget can set only one softkey and set flag that rest of the softkeys
shall be taken from parent.
Priority Handling:
If multiple sokftkeys with same role are set, the highest priority
action gets displayed.
Custom Softkey Menu:
By setting QMenu to QAction and assigning a softkey role for that
action, the native menubar will be displayed when sofkey is clicked.
Softkey Image:
Initial code for implementing sofkey image support, the final
implementation is still pending legal acceptance to use
eiksoftkeyimage.h header file which is under EPL license.
Task-number: QTBUG-7315
Review-By: Sami Merila
Review-By: Jason Barron
|
|\ \ \
| | |/
| |/| |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (70 commits)
doc: Fixed the last qdoc errors.
doc: Document the "Type" enum value as a const in variable.
Designer: Add lower/raise to context menu.
Compile with no-webkit - add missing semi-colons.
Fixes visibility update missing when doing setParentItem on graphicsitem
Stabilize tst_QGraphicsScene::polishItems2 (new test)
Fixed an infinite loop that could occur when reading invalid BMP images.
Updated docs regarding QGLWidget::renderText() limitations.
Added optimization flag to QGraphicsItemPrivate.
Fixed child items with graphics effects not inheriting opacity.
Made the trace replayer handle limited resolution cases better.
Small optimization in raster paint engine.
Another ASSERT while deleting spans
Implement QDirectFBPixmapData::scroll
Potential crash when adding items from QGraphicsWidget::polishEvent().
QGraphicsWidget is painted twice on the inital show.
Fix QPainter::redirection() to pass autotest.
Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.
revert parts of 10392eef4fd4f9
Fix y-inverted pixmaps properly.
...
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-7418
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-7626
|
| | | |
| | | |
| | | |
| | | | |
Also, since domain is never empty, the idx > 0 test is unnecessary.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 436
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This only coincidently worked on Linux, because it creates a QSettings
object to read system settings before any user data was executed, thus
initializing the static default path data. However, if only the
SystemPath was modified, the UserPath never got initialized on
non-Linux platforms, causing settings for the users below $PWD.
Also, it removes unncessary checks and mutex locks, which should
give a slight speed up.
Reviewed-By: dt
|
| | | | |
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.
Pass value as const void *const to QGraphicsSceneIndex::itemChange.
Optimize QGraphicsItem::setFlags.
Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helper
Improve performance of QGraphicsItem::setParentItem.
Make sure cursor is painted at the correct position when we are using IM.
Purely cosmetic (formatting) changes to GL2 engine's GLSL
Use an attribute value for the PMV matrix rather than a uniform
Remove unnecessary depth uniform from GL2 engine's GLSL
Doc fixes: Remove some lies from QEasingCurve.
Fix how we select antialiasing method for text under Mac OS X
|