| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
|
| |
| |
| |
| | |
was added in Qt 4.6
|
| | |
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
configure
src/corelib/global/qglobal.h
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Reviewer: David Boddie
Task number: QTBUG-11938
|
| |
| |
| |
| | |
Rename Q_WS_LITE -> Q_WS_QPA
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
mkspecs/common/qws.conf
src/corelib/io/qresource.cpp
src/gui/image/qpixmapdata_p.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/opengl/qgl_p.h
src/plugins/mediaservices/gstreamer/gstreamer.pro
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/painting/qpainter.cpp
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
tools/linguist/lupdate/main.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
On Symbian, the top-level widget's backing store must be destroyed when
it is no longer required, in order to conserve memory. The criteria
for destroying the backing store is when neither the TLW nor any of
its native descendents (which share the backing store) are visible.
In order to implement this requirement, a count must be kept of the
number of native widgets which are using the TLW's backing store.
This patch provides the mechanism for maintaining this count, and for
destroying the backing store when the count is decremented to zero.
No calls to either the increment nor decrement functions are made,
however, by this code included in this patch; this code will be added
to only the Symbian backend by a subsequent patch.
Task-number: QTBUG-8697
Reviewed-by: Bjørn Erik Nilsen
Reviewed-by: Jason Barron
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
src/gui/kernel/qapplication.cpp
src/gui/painting/qbackingstore.cpp
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/plugins/plugins.pro
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
tools/tools.pro
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Provide overview for Symbian capabilities.
Fix QNX screen initialization
tst_qftp: Attempting to reproduce a crash
QNAM HTTP: Do not pipeline with WebLogic servers
Autotest: update path location on the test server
Autotest: update location of fluke.gif on test server
Make qsTr work in global scope
Not possible to show selected text in virtual keyboard
Fix typos, there is no QT_NO_SSL
Export .flm files always if they are different
Make qmake possible to build with mingw using qmake.pro
QS60Style: Single Click UI support for SD 9.2 time-box
|
| | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
src/script/api/qscriptengine.cpp
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Harald Fernengel
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Adjust indentation to match the rest of the file
Merge-request: 417
Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* make fixupScreenInfo a protected virtual function
* Change is8Track bool to DriverType enum
* Document new functions
Merge-request: 417
Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It seems to be best practice to pass the "update flash" command only
when the entire display needs to be updated, while the refresh call
without updating flash is sufficient for updating smaller regions
Merge-request: 417
Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This patch adds support for e-Ink devices based on the 8-Track chipset,
such as the Sony PRS-505.
The 8-Track driver is a Linux framebuffer driver with a few extensions
and a few glitches in information reporting.
Merge-request: 417
Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/kernel/qwidget.cpp
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8144
Reviewed-by: Jørgen Lind
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Specifying the wrong composition mode triggered an optimization which
caused uninitialized values to be blended in.
Task-number: QTBUG-6625, QTBUG-6906
Reviewed-by: Samuel
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This has no effect unless QT_DIRECTFB_WARN_ON_RASTERFALLBACKS or
QT_DIRECTFB_DISABLE_RASTERFALLBACKS is defined but will decrease
likelyhood of customers encountering strange compile errors if they
don't uncomment it when using these defines.
Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
src/gui/egl/qegl.cpp
src/gui/kernel/qdnd_p.h
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This boils down to using readdir64(_r) and struct dirent64 where
available. I assumed these are available in the same platforms other
such extensions are already being used.
AIX uses the additional type DIR64 and opendir64/closedir64 to
manipulate it.
Task-number: QTBUG-2781
Reviewed-by: Thiago Macieira
|
| |/
| |
| |
| | |
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
This currently includes mouse, wheel, keyboard, enter, leave, geometry,
and close events. Windowing system plugins should limit themselves to
the QWindowSystemInterface::handle*Event() methods, as the other methods
will likely become private.
|
| |
| |
| |
| | |
For plugins: testlite, minimaldfb, vnc, LinuxInput[Mouse|Keyboard]
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
configure
src/corelib/global/qglobal.cpp
src/gui/dialogs/dialogs.pri
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |/
| |
| |
| |
| |
| |
| |
| | |
Certain boards are not support StretchBlit very well. This patch enables
them to define QT_NO_DIRECTFB_STRETCHBLIT to fall back to the raster
engine for stretchblits.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-3344
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
uses of QT_DEPRECATED must be protected by #ifdef
Task-number: QTBUG-6649
Reviewed-by: João Abecasis
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
configure
src/plugins/graphicssystems/graphicssystems.pro
|
| |
| |
| |
| |
| |
| |
| | |
QRegion::numRects() is marked obsolete.
Removed all usage of the old function inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The name numCols is ambiguous, as sometimes it's refering to the number
of columns, and sometimes the number of colors. It also does not match
the typical Qt naming convention *Count().
Reviewed-by: Tom Cooksey
Reviewed-by: Andreas Aardal Hanssen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QPaintDevice and QImage used the functions numColors(), setNumColors(),
and numBytes(). However, this is not consistent with the rest of the Qt
API which uses *Count() and set*Count().
Removed all usage of these functions inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QTextEdit (via QTextLayout) and QPlainTextEdit in Qt used to ignore
any font leading but added one extra pixel in QFontMetrics. With many
freetype fonts, this resulted in a "spacy" text layout.
The necessary fixes on X11 and Windows were to take (positive) leading
into account, to make the font database convert point sizes to pixel
sizes without rounding to plain integer values, and to subtract the
extra pixel from QFontMetrics from the font engines' descent value.
The change also fixes several places in styles and widgets, where
QFontMetrics::lineSpacing() was wrongly used instead of
QFontMetrics::height().
Ideally we should also handle negative leading, which would require
additional and bigger code changes in QTextLayout and QPlainTextEdit.
In addition, all other editors we have tested seem to ignore leading on
X11. If we choose to believe the values provided by freetype, our text
layout would be one pixel smaller than everybody else's.
On the Mac, this change does nothing. There our layout is still too spacy,
and for smaller fonts quite ugly compared to native Mac applications.
Done with mae.
Reviewed-by: mae
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously you had to define QT_NO_DIRECTFB_SUBSURFACE to prevent Qt
from using subsurfaces for locked surfaces. Now make the default be
QT_NO_DIRECTFB_SUBSURFACE and rather allow people to define
QT_DIRECTFB_SUBSURFACE to use this option.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qapplication.cpp
src/gui/kernel/qwidget.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
Change authored by Rhys.
Bug introduced by the change to allow user-specific cache and pipe
directories.
Reviewed-by: Jeremy
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This turns the changes in 072e748adbdab1d51b240b9983ce82b213b66f18 off
by default. Define QT_PRIVATE_QWS to turn them on. This must be done for
both qvfb (X11 build) and libQtGui (QWS build). Failure to do so will result
in an inability for applications to communicate with the server.
Task-number: QTBUG-1711
Reviewed-by: Paul
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-1711
Reviewed-by: Paul
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
src/gui/image/qpixmapdatafactory.cpp
src/gui/kernel/qapplication_p.h
src/gui/painting/qgraphicssystem.cpp
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-4473
Reviewed-by: Paul
|
| |
| |
| |
| |
| |
| | |
We need to lock before falling back to QRasterPaintEngine
Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
This seems not work correctly on quite a few boards so I'd rather have
people turn it on explicitly.
Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
|