summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master'Jason Barron2009-08-065-72/+84
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qfilesystemmodel/qfilesystemmodel.pro tests/auto/qfontdialog/tst_qfontdialog.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp tests/auto/qsqldriver/qsqldriver.pro tests/auto/qsqlquery/qsqlquery.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qstatemachine/tst_qstatemachine.cpp tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-053-31/+37
| |\
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-0559-551/+506
| | |\
| | * | memory leak fix in standardItemModel found during combo box testingmread2009-08-052-13/+11
| | | |
| | * | protecting against leak in QSymbianControl when QWidget construction failsmread2009-08-051-18/+26
| | | |
| * | | Implemented QDesktopServices TODOs, and fixed coding style deviations.Janne Anttila2009-08-052-41/+47
| | |/ | |/|
* | | Compile with Q_DECLARE_SCOPED_PRIVATE.Jason Barron2009-08-045-9/+9
| | | | | | | | | | | | | | | These classes were moved so they were not updated correctly when I did the merge.
* | | Merge commit 'origin/master'Jason Barron2009-08-04505-1693/+2139
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | 'Trailing whitespace' fixes from s60installsJanne Anttila2009-08-042-15/+15
| | |
| * | Blank line, trailing whitespace etc fixes for s60mainJanne Anttila2009-08-049-16/+8
| | |
| * | Trailing whitespace and tab/space fixes for src/guiJanne Anttila2009-08-0423-327/+321
| | |
| * | Trailing whitespace and tab/space fixes for src/pluginsJanne Anttila2009-08-048-8/+3
| | |
| * | Applied Qt coding conventions for s60mainJanne Anttila2009-08-045-68/+67
| | |
| * | Trailing whitespace and tab/space fixes for src/corelibJanne Anttila2009-08-0414-48/+46
| | |
| * | Cleanup and applied Qt coding style for qnetworkinterface_symbian.cppJanne Anttila2009-08-041-68/+46
| | |
| * | Trailing whitespace and tab/space fixes for QtSqlJanne Anttila2009-08-041-2/+1
| |/
| * CFbsBitmap::DataSize() seems to be a private Api function.Alessandro Portale2009-08-031-1/+1
| | | | | | | | | | | | | | But CFbsBitmap::Header().iBitmapSize seems to do the same job, and it works wit hthe public SDK. Thanks to jbarron for finding that public pendant.
| * fixed qt_pixmapToNativeBitmap name merge problemmread2009-08-031-4/+4
| |
| * Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-03461-1096/+1496
| | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
| * Trailing whitespace and tab/space fixes for QtNetworkJanne Anttila2009-08-0314-123/+122
| |
| * Restored window title after another top-level window was closed.Janne Anttila2009-07-311-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | Task: 249995 The window title in S60 is global entity, i.e. is located in application status pane. When top level window, for example mesage box is closed, the window title has to be restored for window which is getting the focus. This way we don't leave title from destroyed window to title bar. It is also into question, whether the non-maximized dialogs should set title to statuspane at all. For now they will, but things may change if we switch to use native dialogs.
| * Removed unnecessary code, UID is associated to wserv by framework.Janne Anttila2009-07-311-5/+0
| | | | | | | | | | | | | | | | | | | | This code was inialy added before we had s60main. Since that time we did not had S60 application framework classes constructed we had to associate application UID to wserv manually to get fast swap window (FSW) working correctly. Now application frameworks take care of associating the UID to wserv window group.
| * Removed tiff libarary warning: `inline' redefined.Janne Anttila2009-07-301-0/+2
| | | | | | | | | | Since inline is defined by platform, it should be safe to leave it as is, and not to tuch the definition here at all.
| * Added some spaces to pkg_prerules statements to make output more readable.Janne Anttila2009-07-301-1/+4
| |
| * Swicthed back to original way of using AddToStackL and RemoveFromStackJanne Anttila2009-07-301-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: 258504 This commit fixes the problem that background widgets do not get orientation change events, and thus will not be correctly layouted after the foreground windget is closed. See also: c17c1c101cbe09d4c6149ef8e76a9bb792222456 At the time when commit c17c1c101cbe09d4c6149ef8e76a9bb792222456 was created there were no SetFocus calls in hide_sys and show_sys. I think that has been the root cause why focus change event has not been generated. I.e. hiding a CCoeControl in Symbian (MakeVisible) does not generate focus event but setFocus(false/true) generates. I tried this code with Drilldown example. In city detaisl view the combobox was working fine with keypad navigation. The change had no effects to qcombobox autotest results and qwidget autotest resutls were better on some run and a bit worse on some run. There was variation in 2-4 qwidget autotest results on each run. Note also that screensaver seems to affect to test results.
| * Extended PKG customization possibilities via qmake.Janne Anttila2009-07-291-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: 242139 This commit replaces Symbian specific 'depends' keyword in qmake DEPLOYMENT variable with two more generic ones. The new keywords are 'pkg_prerules' and 'pkg_postrules', and they allow developer to pass raw data to PKG file. The strings in 'pkg_prerules' are added before PKG file package-body headers and 'pkg_postrules' after them. Correspondingly as old 'depends' keyword, the new keywords are not parsed by qmake, so they must be in a format understood by Symbian package generation tools. Note that 'pkg_prerules' can also replace default language, package-header and vendor statements in pkg file. If you decide to override any of these statements, you need to pay attention that also other statements stay valid.
| * Small optimization.Aleksandar Sasha Babic2009-07-241-0/+4
| | | | | | | | Do not use route info for addresses other than IPV4.
| * For some reason interface info on Symbian will notAleksandar Sasha Babic2009-07-241-2/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | give neither correct netmask nor broadcast address. But, experiments show that route info can be used to obtain netmask. Then is easy to calculate broadcast address. Idea is to match interface and destination address from routeinfo entry, and then to use given netmask. "Machines take me by surprise with great frequency." Alan Turing(1912 - 1954)
* | Fix more compile breakages after merging qt/master-stable.Jason Barron2009-08-044-22/+20
| | | | | | | | | | | | A lot of the logic was factored out of QLineEdit(Private) and into a private class called QLineControl, however the changes did not compile when keypad navigation is enabled so fix them.
* | Merge commit 'qt/master-stable'Jason Barron2009-08-041640-24843/+51730
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | Fixed "Hightlighted menu items not always selected" bug.Gabriel de Dietrich2009-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Menu paintEvent was not called when the mouse cursor lied between the menu item area and the menu frame border. Task-number: 258920 Reviewed-by: olivier
| * | Fix compile error on WinCE.Prasanth Ullattil2009-08-032-1/+16
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Fixed some perspective transform rendering bugs.Samuel Rødal2009-08-034-155/+82
| | | | | | | | | | | | | | | | | | | | | | | | The bugs were caused by not clipping to the near plane (w = 0) when mapping primitives with perspective tranfsorms. Task-id: 258961 Reviewed-by: Gunnar
| * | Wizard background images incorrect in Snow Leopard.Prasanth Ullattil2009-08-031-0/+1
| | | | | | | | | | | | | | | | | | | | | We need to clear the QPixmap before the image is drawn using the CGContextDrawImage(). Reviewed-by: Norwegian Rock Cat
| * | Fix deadlock in the fsevents file watcher.Norwegian Rock Cat2009-08-032-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was making an assumption that one could call CFRunLoopStop and expect that the runloop would stop very soon afterwards. This is a bit naive and can result in situations where we end up running past and entering run again before everything is finished. We now make sure that we don't leave stop() until the we really have stopped the other thread. Reviewed-by: mbm
| * | fixed broken integration of qwindowsurface_raster.cppGunnar Sletta2009-08-031-1/+1
| | |
| * | Ensure that we never increase the strong reference count up from zero.Thiago Macieira2009-08-031-4/+14
| | | | | | | | | | | | | | | | | | Also add some thread stress tests to try and detect doing it wrong. Reviewed-By: Bradley T. Hughes
| * | Change the pointer-tracking code to work everywhere.Thiago Macieira2009-08-031-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if you create a QSharedPointer in code with pointer-tracking, you must ensure it gets deleted in code with pointer-tracking, otherwise the internal safety tracker will be "leaking" objects. The pointers would never get removed. And if any new pointer happened to have the same pointer address (which happens quite often), the tracker code would promptly abort the application. With this change, the untracking of the pointer is scheduled by the same code that creates the tracking. This is done by "abusing" the custom deleter code: - for the QSharedPointer that used ExternalRefCountWithDestroyFn already, we intercept the call to the destroy function and call the untracking function - for a normal QSharedPointer, we use the "normalDeleter" function as custom deleter and chain up above Note: the autotest only *really* works in release mode. Otherwise functions don't get inlined and do get merged by the linker. Reviewed-By: Bradley T. Hughes
| * | Don't forget to delete the deleter object too in QSharedPointer.Thiago Macieira2009-08-031-0/+3
| | | | | | | | | | | | | | | | | | Destructors have to be run for the subobjects we initialise. Reviewed-By: Bradley T. Hughes
| * | Cleanup old code in QSharedPointerThiago Macieira2009-08-031-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't support MSVC 6.0 or MSVC .NET 2002, so all compilers we support can deal with member templates and partial template specialisation. Remove the #ifdef protecting the code that needed it. Also add some comments indicating the sizes of the structures. There is no padding necessary in most cases. Reviewed-By: Trust Me
| * | Remove the need for internal API in QSharedPointer.Thiago Macieira2009-08-031-3/+1
| | | | | | | | | | | | | | | | | | | | | That way, this code can be compiled with an earlier version of Qt and should still work in new ones. Reviewed-by: Trust Me
| * | Autotest: add a way to ensure that there are no safety-check pointers leakingThiago Macieira2009-08-031-1/+22
| | | | | | | | | | | | | | | In the future, it would be nice to split the autotest in multiple functions at every check().
| * | Merge branch 'master' of git:qt/qtThiago Macieira2009-08-0310-25/+30
| |\ \
| | * | Warning --Alexis Menard2009-08-031-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Fixed warnings on phonon/ds9 with mingw (gcc 4)Thierry Bastian2009-08-039-23/+28
| | | | | | | | | | | | | | | | Reviewed-by: Trustme
| * | | Merge branch '4.5'Thiago Macieira2009-08-0327-356/+484
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| | * | Cocoa with namespace breaks the buildRichard Moe Gustavsen2009-07-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the needed macros around the classnames the way it should be done. Reviewed-by: Prasanth
| | * | Coverty warnings --. This switch was missing a break.Alexis Menard2009-07-301-0/+1
| | | | | | | | | | | | | | | | Reviewed-by:TrustMe
| | * | Allow maximize button on the titlebar for a fixed size windowDenis Dzyubenko2009-07-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows we will add maximize button to the titlebar even if the window has a fixed size if the user explicitely asked for it by setting Qt::CustomizeWindowHint | Qt::WindowMaximizeButtonHint. Task-number: 250188 Reviewed-by: Leonardo Sobral Cunha
| | * | Remove mem leak / warning in the cocoaportRichard Moe Gustavsen2009-07-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove mem leak / warning in the cocoaport Reviewed-by: msorvig
generated by cgit v0.12 at 2024-09-25 02:38:00 (GMT)