summaryrefslogtreecommitdiffstats
path: root/src/gui/embedded
Commit message (Collapse)AuthorAgeFilesLines
* Merge earth-team into origin/master'Olivier Goffart2011-04-121-20/+21
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-20/+21
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| | * Manually amend latin1 changeHarald Fernengel2011-04-011-13/+24
| | | | | | | | | | | | | | | The result of QLatin1String + QLatin1String is a QStringBuilder object, not a QString. Fall back to QString.arg(). Patch by Ritt Konstantin.
| | * suppress warnings about ASCII to QString conversionRitt Konstantin2011-03-311-29/+15
| | | | | | | | | | | | | | | | | | | | | and optimize macroses to use string literal concatenation instead of .arg() Merge-request: 1038 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * take the user defined temp dir into accountRitt Konstantin2011-03-311-6/+10
| | | | | | | | | | | | | | | | | | | | | use user's QT_QWS_TEMP_DIR rather than hardcoded "/tmp" one Merge-request: 1038 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-072-5/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| * | QWS: fix the software/hardware cursor switcherRitt Konstantin2011-03-312-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | because of typo, this never worked before. drop the meaningless local qt_sw_cursor variable and use the correct application-wide qws_sw_cursor one Merge-request: 2587 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | | fix order of #include-s on SPARCRitt Konstantin2011-04-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | on some systems (i.e. on SPARC), the order of IPC-related includes is meaningful; sys/types.h, then sys/ipc.h, then sys/sem.h, and so on Merge-request: 2586 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* | | move semun declaration to qcore_unix_p.hRitt Konstantin2011-04-013-43/+18
|/ / | | | | | | | | | | | | | | | | | | | | according to X/OPEN we have to define semun ourselves but on some systems sem.h will have it, so let's use a prefixed one (qt_semun). this allows to avoid the code duplication and makes things a bit easier to undesrtand Merge-request: 2586 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* | Fix license headersHarald Fernengel2011-02-226-114/+162
| |
* | INTEGRITY screen, mouse and kbd driversRolland Dudemaine2011-02-2211-1/+1113
| | | | | | | | | | | | | | | | Add INTEGRITY RTOS framebuffer, mouse and keyboard drivers that use native INTEGRITY APIs. Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-251-1/+1
| |
* | Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-26111-111/+111
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17111-111/+111
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| | * Update copyright year to 2011.Jason McDonald2011-01-10111-111/+111
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Add Qt::Key_ScreenSaverPaul Olav Tvete2011-01-181-0/+1
|/ /
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-263-3/+5
|\ \ | |/ | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * Fixed many spelling errors.Rohan McGovern2010-10-252-3/+3
| |
| * Doc: adding note to function QWSKeyboardHandler::processKeycode - that it ↵Morten Engvoldsen2010-10-071-0/+2
| | | | | | | | was added in Qt 4.6
* | Add keycodes for some additional multimedia keysPaul Olav Tvete2010-10-111-0/+7
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-271-1/+1
|\ \ | |/ | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h
| * I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-141-1/+1
| |
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-192-2/+2
|\ \ | |/
| * Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-092-2/+2
| | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-11938
* | Say hello to Q_WS_QPA!Jørgen Lind2010-06-241-2/+2
| | | | | | | | Rename Q_WS_LITE -> Q_WS_QPA
* | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-181-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Added reference counting to QWidgetBackingStoreGareth Stockwell2010-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-213-7/+71
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-04-141-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-141-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp
| | | * Fix QNX screen initializationJohannes Zellner2010-04-131-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Harald Fernengel
| * | | Adjust indentationBernhard Rosenkraenzer2010-04-081-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust indentation to match the rest of the file Merge-request: 417 Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| * | | e-Ink support cleanupBernhard Rosenkraenzer2010-04-082-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | | Tweak the display update IOCTL callsBernhard Rosenkraenzer2010-04-081-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Support 8-Track e-Ink devicesBernhard Rosenkraenzer2010-04-082-6/+47
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-113-4/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp
| * | Don't show resize cursor for fixed-size windowsPaul Olav Tvete2010-03-101-2/+4
| | | | | | | | | | | | | | | Task-number: QTBUG-8144 Reviewed-by: Jørgen Lind
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-062-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Fix compositing when QWS background is completely transparent.Paul Olav Tvete2010-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Uncomment #DIRECTFB_DRAWINGOPERATIONS in pri-fileAnders Bakken2010-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-012-11/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: configure src/gui/egl/qegl.cpp src/gui/kernel/qdnd_p.h
| * | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-151-10/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Use X/Open LFS extensions for 64-bit support on directory iterationJoão Abecasis2010-01-291-10/+11
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Lock before calling drawStaticTextItemAnders Bakken2010-02-021-1/+1
| |/ | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Move user event handling into QWindowSystemInterface classJeremy Katz2010-02-101-2/+2
| | | | | | | | | | | | | | 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.
* | queue user mouse, wheel, and keyboard input eventsJeremy Katz2010-01-261-2/+1
| | | | | | | | For plugins: testlite, minimaldfb, vnc, LinuxInput[Mouse|Keyboard]
* | Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-14112-111/+115
|\ \ | |/ | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.cpp src/gui/dialogs/dialogs.pri
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-07111-111/+111
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v0.12 at 2025-01-15 11:48:16 (GMT)