summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-141-1/+1
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Typo fix in qtestlib
| * Typo fix in qtestlibMarkus Goetz2010-03-141-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Moved Symbian audio backend into QtMultimedia.dllGareth Stockwell2010-03-1215-385/+237
| | | | | | | | | | | | | | | | | | Changed backend from being a plugin, to being statically compiled into QtMultimedia.dll. This is to achieve consistency with the backends for other plugins, and to allow the plugin API to be modified. Task-number: QTBUG-8994 Reviewed-by: trustme
* | Updated Symbian DEF filesGareth Stockwell2010-03-122-2/+2
| | | | | | | | | | | | Marked as absent a symbol removed by 971f1947 Reviewed-by: trustme
* | Updated qt.ibyMiikka Heikkinen2010-03-121-70/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Dependencies were removed as they cause difficulties for maintaining ROM build configurations. - PAGED flags were removed as paging configuration should be handled via other means. - MMF Phonon backend was commented out by default as normally ROM builds have Helix backend for Phonon included. Part of QtP delta reduction effort. Reviewed-by: Iain
* | Fixed filename cases to support building Qt for Symbian in LinuxMiikka Heikkinen2010-03-1215-34/+34
| | | | | | | | | | | | | | Part of QtP delta reduction effort. Task-number: QT-3055 Reviewed-by: Janne Koskinen
* | Moved softkey "Options" action handling from QMainWindow to QMenuBar.Janne Anttila2010-03-124-34/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is done to enable QMenuBar usage and related "Options" softkey also on other than QMainWindow objects. For example with this change it is possible to create menubar and set it to QLayout by using setMenuBar, and it will then be usable via "Options" softkey. This functionality makes it easy to use different menus for different views in QStackedWidget. Task-number: QT-2275 (Not yet finished, but related) Reviewed-by: Sami Merila Reviewed-by: Alessandro Portale
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-122-2/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: HotFix for fluidlauncher default size caused by 6d44dadd. Removed compiler warning from qdesktopwidget_s60.cpp.
| * | HotFix for fluidlauncher default size caused by 6d44dadd.Janne Anttila2010-03-121-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that in Symbian we cannot restore Qt::WA_Moved and Qt::WA_Resized attributes in setWindowState method to the same ones what the attributes were when method was called. Thus we currently make sure that Qt::WA_Moved and Qt::WA_Resized attributes are not touched when normal window state is applied. There is a new task QTBUG-8977 to sort out when those attributes should be set and when not. Reviewed-By: Sami Merila
| * | Removed compiler warning from qdesktopwidget_s60.cpp.Janne Anttila2010-03-121-0/+1
| | | | | | | | | | | | Reviewed-By: TrustMe
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-121-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Ensure that the entire CLOB can be returned from an Oracle database
| * | | Ensure that the entire CLOB can be returned from an Oracle databaseAndy Shaw2010-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original CLOB was being truncated at 4000 bytes, even though the CLOB can hold up to 4gig, this ensures that its possible to get the whole thing. There is already a test in qsqlquery for this. Task-number: QTBUG-3875 Reviewed-by: Bill King
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-121-0/+20
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioInput sometimes not writing to QIODevice
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-03-1111-20/+35
| |\ \ \
| * | | | QAudioInput sometimes not writing to QIODeviceKurt Korbatits2010-03-111-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle error recovery better. Task-number:QTBUG-8893 Reviewed-by:Derick Hawcroft
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-111-3/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bug in QTransform::type() after using operator/ or operator*.
| * | | | Fixed bug in QTransform::type() after using operator/ or operator*.Samuel Rødal2010-03-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The m_dirty variable is not a bit flag any more. This caused the switch in QTransform::type() to not match any of the transformation types, and m_type was left at TxNone. Task-number: QTBUG-8557 Reviewed-by: Gunnar Sletta
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-116-7/+25
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 266a6c4f1938dd9edf4a8125faf91c62495e3ce2 ) Doc: Removed lie that access to QBuffer is unbuffered. Minisplitter doesn't paint to the bottom/right Avoid unnecessary memory allocation in the jpeg handler's image detection
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-03-113-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 266a6c4f1938dd9edf4a8125faf91c62495e3ce2 ) Changes in WebKit/qt since the last update: [Qt] Avoid double-buffering with Qt image decoders http://trac.webkit.org/changeset/55844
| * | | | Doc: Removed lie that access to QBuffer is unbuffered.Simon Hausmann2010-03-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In fact QIODevice still _does_ buffer access through QBuffer currently. Reviewed-by: Markus Goetz Reviewed-by: Joao
| * | | | Minisplitter doesn't paint to the bottom/rightCarlos Manuel Duclos Vergara2010-03-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is not related to the Splitter handle but related to an optimization in the paintengine. We were comparing if the size of the widget had changed before setting the new mask, which might not be correct. We could have changed the mask without changing the widget size. Task-number: QTCREATORBUG-753 Reviewed-by: Morten Reviewed-by: Samuel
| * | | | Avoid unnecessary memory allocation in the jpeg handler's image detectionSimon Hausmann2010-03-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handler calls peek with 2 bytes to inspect the first two bytes. Instead of calling the overload of peek() that returns a new QByteArray with just two bytes, allocate 2 bytes on the stack and call the overload of peek() that writes into the specified buffer. Reviewed-by: Joao
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-112-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Ensure audio converter member is initialized. Documentation fix.
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-03-111-1/+5
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | into 4.6
| * | | | Ensure audio converter member is initialized.Justin McPherson2010-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
| * | | | Documentation fix.Justin McPherson2010-03-111-1/+1
| | |/ / | |/| | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-118-17/+32
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support for adding user specified list type content in rss file Fixed RSS_RULES statement in application_icon.prf XFAIL for a new qwidget autotest on MAC and QWS. Fixed dialog resize not to move the dialog for Symbian. Fix SDP files are not supported. Fix build break caused by undefined symbol SetDialogPreference Renamed test benchmark targets. Added check for null pointer in qt_vg_unregister_pixmap. Add '.' dir as the first include directory in Symbian Enabled some examples by default in Symbian builds Added forwarding headers for qplatformdefs.h in Symbian mkspecs QUnixPrintWidget should not be declared in Symbian Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location. Export qtdemoapps.iby to proper location Added some missing IBY export paths to platform_path.prf
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-118-17/+32
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed dialog resize not to move the dialog for Symbian. Fix SDP files are not supported. Fix build break caused by undefined symbol SetDialogPreference Renamed test benchmark targets. Added check for null pointer in qt_vg_unregister_pixmap. Add '.' dir as the first include directory in Symbian Enabled some examples by default in Symbian builds Added forwarding headers for qplatformdefs.h in Symbian mkspecs QUnixPrintWidget should not be declared in Symbian Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location. Export qtdemoapps.iby to proper location Added some missing IBY export paths to platform_path.prf
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-118-17/+32
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed dialog resize not to move the dialog for Symbian. Fix SDP files are not supported. Fix build break caused by undefined symbol SetDialogPreference Renamed test benchmark targets. Added check for null pointer in qt_vg_unregister_pixmap. Add '.' dir as the first include directory in Symbian Enabled some examples by default in Symbian builds Added forwarding headers for qplatformdefs.h in Symbian mkspecs QUnixPrintWidget should not be declared in Symbian Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location. Export qtdemoapps.iby to proper location Added some missing IBY export paths to platform_path.prf
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-108-17/+32
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed dialog resize not to move the dialog for Symbian. Fix SDP files are not supported. Fix build break caused by undefined symbol SetDialogPreference Renamed test benchmark targets. Added check for null pointer in qt_vg_unregister_pixmap. Add '.' dir as the first include directory in Symbian Enabled some examples by default in Symbian builds Added forwarding headers for qplatformdefs.h in Symbian mkspecs QUnixPrintWidget should not be declared in Symbian Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location. Export qtdemoapps.iby to proper location Added some missing IBY export paths to platform_path.prf
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-108-17/+32
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed dialog resize not to move the dialog for Symbian. Fix SDP files are not supported. Fix build break caused by undefined symbol SetDialogPreference Renamed test benchmark targets. Added check for null pointer in qt_vg_unregister_pixmap. Add '.' dir as the first include directory in Symbian Enabled some examples by default in Symbian builds Added forwarding headers for qplatformdefs.h in Symbian mkspecs QUnixPrintWidget should not be declared in Symbian Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location. Export qtdemoapps.iby to proper location Added some missing IBY export paths to platform_path.prf
| | | | | * Fixed dialog resize not to move the dialog for Symbian.Janne Anttila2010-03-103-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDialog::resize() also moved the dialog in Symbian. This occured since adjustPosition was called as an result of resize and that method did not check if dialog position was explicitly set. In addition it was found that in Symbian WA_Resized and WA_Moved attributes were basically set for almost all top-level widgets by system. This was also fixed and a new auto test was introduced to verify these attributes in all platforms. Windows platform also suffers from bug in this area, and a separate task QTBUG-5897 for it was created Task-number: QTBUG-5897 Reviewed-by: Sami Merila
| | | | | * Merge branch 'mmfphonon' into 4.6Frans Englich2010-03-101-10/+12
| | | | | |\
| | | | | | * Fix SDP files are not supported.Frans Englich2010-03-101-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Phonon glue code rejected SDPs based on the MIME type for SDPs. Task-number: QTBUG-8702 Reviewed-by: Gareth Stockwell
| | | | | * | Added check for null pointer in qt_vg_unregister_pixmap.Miikka Heikkinen2010-03-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method qt_vg_unregister_pixmap is sometimes called when the QVGSharedContext is already destroyed. Do not try to access it if it is null. Part of QtP delta reduction effort. Reviewed-by: Jason Barron
| | | | | * | QUnixPrintWidget should not be declared in SymbianMiikka Heikkinen2010-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having QUnixPrintWidget declaration causes build breaks in some environments, so defined it out in Symbian. Part of QtP delta reduction effort. Reviewed-by: Janne Anttila
| | | | | * | Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location.Miikka Heikkinen2010-03-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sqlite3.iby needs to be exported under epoc32/rom/include/core/mw, instead of epoc32/rom/include. Part of QtP delta reduction effort Reviewed-by: TrustMe
| | | | | * | Export qtdemoapps.iby to proper locationMiikka Heikkinen2010-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of QtP delta reduction effort Reviewed-by: Janne Anttila
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-111-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QVarLenghtArray: Call constructor when resizing the array for Movable types.
| * | | | | | QVarLenghtArray: Call constructor when resizing the array for Movable types.Olivier Goffart2010-03-111-2/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The constructor of complex type that are declared as Movable (such as many of our containers) were not being called. The raison is that the 's' was set to 'asize' right after the qMemCopy So we need to reset 's' to old size in the movable case (in all cases) In the static case, 's' has already be incremented to osize The 's = asize;' can be removed as it is anyway done at the very end of the function Task-number: QTBUG-6718 Reviewed-by: Harald Fernengel
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-03-116-27/+40
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-101-0/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: SIGSEGV after QAudioOutput closed.
| * | | | | Worked around driver bug causing clipping errors on N900.Samuel Rødal2010-03-101-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently the driver does some optimization which causes it to behave erratically when stencil testing is enabled. Multiplying the return value from the texture lookup by 1.0 disables the optimization. Task-number: QTBUG-8753 Reviewed-by: Trond
| * | | | | Do qFatal() on unsupported screen format instead of crashing laterPaul Olav Tvete2010-03-101-0/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Task-number: Related to QTBUG-5117 Reviewed-by: Jørgen Lind
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-103-7/+21
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: compile fix for plugins\sqldrivers\sqlite on WinCE 6 fix menu handling on Windows CE
| | * | | compile fix for plugins\sqldrivers\sqlite on WinCE 6Joerg Bornemann2010-03-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use localtime_s. Reviewed-by: thartman
| | * | | fix menu handling on Windows CEJoerg Bornemann2010-03-102-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't recreate the menu handles on every rebuild. Now, we clear the menu before rebuilding. Also, we have to clear the menu before destroying the menu bar handle. Otherwise, DestroyWindow kills our menu handles. Task-number: QTBUG-8754 Reviewed-by: thartman
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-101-17/+8
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed paint crash in Symbian for trasnclucent dialogs. Implemented QLibraryInfo::TranslationsPath for Symbian.
| | * | | Fixed paint crash in Symbian for trasnclucent dialogs.Janne Anttila2010-03-101-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian Qt::WA_TrasnclucentBackground is set for QDialogs. In QTBUG-8706 there is setVisible(false) call for widget before orientation is switched from portrait to landscape with SW APIs. This setVisible call invalidates/marks the widget area, basically whole portrait screen (0,0, 360, 640 in 5800XM) dirty. The orientation switch changes backingstore/windowsurface size to 640, 360, and invalidates that area. As an consequnce the widget dirty area after these two operations is 0, 0, 640, 640. Now when the widget is made visible again, the dirty region is larger than a screen and causes a crash when trying to access windowsurface bitmap data outside its bounds. Fixed the issue by using QPainter instead of own implementation. QPainter handles intersecting with image automatically. Another benefit of QPainter is that it uses platform specific drawHelpers if available to speed-up drawing. Task-number: QTBUG-8706 Reviewed-by: Jani Hautakangas
* | | | | QAudioInput::processedUSecs() incorrectKurt Korbatits2010-03-111-1/+5
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug introduced by change 04532ba052559b265b1bc85dc143d8aeeb02149f Was calculating time assuming totalTimeValue was in frames but it is stored as bytes in alsa input case. Reviewed-by:Dmytro Poplavskiy
generated by cgit v0.12 at 2024-09-24 16:34:24 (GMT)