summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-2312596-237080/+1658677
|\ | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/fluidlauncher/config_s60/config.xml demos/embedded/fluidlauncher/fluidlauncher.pro src/corelib/io/io.pri src/gui/kernel/qapplication_s60.cpp src/gui/kernel/qwidget_s60.cpp src/s60installs/qt_libs.pro
| * Don't warn of an unused 'window' argument.Jan-Arve Sæther2009-09-231-0/+2
| |
| * Fall back to pixmaps in xp style when toplevel is translucentGunnar Sletta2009-09-231-1/+10
| | | | | | | | | | | | | | | | The "fast path" will write bad premlutiplied pixels into the backbuffer so the blending will be broken, plus that the window does not get mouse events for alpha=0 pixels. Reviewed-by: Marius Storm-Olsen
| * QRingBuffer: Try to minimize memory consumption while it is emptyMarkus Goetz2009-09-231-5/+18
| | | | | | | | | | | | | | | | | | Try not to hold an unused 4k QByteArray. This may introduce a performance regression e.g. for QNetworkReply in exchange for lower memory usage. We will see if this is really the case. Reviewed-by: Thiago
| * QNAM HTTP Code: Properly remove aborted requests from processingMarkus Goetz2009-09-234-4/+41
| | | | | | | | | | | | | | | | This fixes a crash that occured because aborted requests were not properly removed from the channel.alreadyPipelinedRequests. Task-number: QTBUG-4507 Reviewed-by: Peter Hartmann
| * Fix new test so it works on QWSPaul Olav Tvete2009-09-231-1/+1
| |
| * Fix tst_QWidget::showMaximized on X11Olivier Goffart2009-09-231-1/+1
| | | | | | | | | | | | On X11 We have to wait we get the size change from the window manager Reviewed-by: Jason Barron
| * tst_QFileSystemWatcher::watchFileAndItsDirectory fixed for Windows CEJoerg Bornemann2009-09-231-0/+3
| | | | | | | | | | | | We skip parts of watchDirectory for the same reason. Reviewed-by: thartman
| * Remove supported platforms from dist/README.Jason McDonald2009-09-231-49/+2
| | | | | | | | | | | | | | This is a maintenance headache. Just reference the canonical supported platforms list instead. Reviewed-by: Trust Me
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-2315-38/+72
| |\
| | * Make gtkstyle work on non-developer machines againHarald Fernengel2009-09-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | While refactoring gtkstyle in 4.6, the "0" .so suffix was dropped. This patch restores the 4.5 behavior to look for *.so.0 since the *.so is only available if you install the gtk developer packages. Reviewed-by: jbache
| | * Removed explicit TARGET.EPOCHEAPSIZE statements from script testsMiikka Heikkinen2009-09-234-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | Large enough max heap for script tests is now defined by default for all tests in qttest_p4.prf, so removed the statements from individual script tests. Reviewed-by: Janne Anttila
| | * Fix autotest compilationJoão Abecasis2009-09-232-1/+3
| | |
| | * Merge branch 'QTBUG-3524' into 4.6Jan-Arve Sæther2009-09-232-0/+19
| | |\
| | | * Small API addition: Make addChildLayoutItem available for subclasses.Jan-Arve Sæther2009-09-232-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many people have requested this. And since its protected it does not really pollute the API a lot. Task: QTBUG-3524 Reviewed-by: mbm
| | * | more meaningful output in tst_QAudioOutput::pullFileJoerg Bornemann2009-09-231-12/+12
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | tests/auto/qaudioinput deployment rules fixed for Windows CEJoerg Bornemann2009-09-231-2/+10
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | tests/auto/qaudiooutput deployment rules fixed for Windows CEJoerg Bornemann2009-09-231-5/+7
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Added a comment to clarify the purpose of a piece of code.Trond Kjernåsen2009-09-231-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Fix compilation errors in qcombobox autotestShane Kearns2009-09-231-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dependency on windows style, without including the header file Needed static casts to compare QWidget* with QComboBox* at least for the Nokia x86 compiler. Reviewed-by: axis
| | * | QJpegImageHandle: Avoid smooth scalling when it should not.Olivier Goffart2009-09-231-1/+5
| | |/ | | | | | | | | | | | | | | | Task-number: QTBUG-3211 Task-number: 236875 Reviewed-by: Alex
| * | Add platform-specific README's.Jason McDonald2009-09-232-0/+225
| |/ | | | | | | | | | | | | | | These files were previously added to source packages by the packaging system. There's no reason why these files shouldn't be available to repo users too. Reviewed-by: Trust Me
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-2369-888/+1004
| |\
| | * Try to stabilize and speedup the qwidget testOlivier Goffart2009-09-221-516/+378
| | | | | | | | | | | | | | | | | | | | | The test goes in only almost 30seconds now. But i still have few failures Reviewed-by: Denis
| | * add --sort-contexts optionOswald Buddenhagen2009-09-221-0/+4
| | | | | | | | | | | | ok, so this is a feature ... a 4-line-one ...
| | * fix QApp::translate() callsOswald Buddenhagen2009-09-221-5/+5
| | | | | | | | | | | | Reviewed-By: Simon Hausmann
| | * don't crash in property access after script class has been set to 0Kent Hansen2009-09-223-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | When the script class is set to 0, we need to remove the script object's delegate entirely, because the delegate requires a non-0 script class in order to be useful. Reviewed-by: Olivier Goffart
| | * Ray casting example: bypass alpha-blending for an easy speed-up.Ariya Hidayat2009-09-221-0/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Stabilize some testsOlivier Goffart2009-09-223-14/+12
| | |
| | * Stabilize more testOlivier Goffart2009-09-226-20/+21
| | |
| | * Fixed crash in QFileSystemWatcher for addPath(nonExistingFile)gunnar2009-09-222-0/+16
| | | | | | | | | | | | Reviewed-by: Eskil
| | * Fix QFileInfo autotest to run from a shadow buildJoão Abecasis2009-09-222-35/+90
| | | | | | | | | | | | | | | | | | Also, don't depend on the existence of ~/.qt/ Reviewed-by: Olivier Goffart
| | * Add a test for the first ::processEvents() on QApplicationBenjamin Poulain2009-09-221-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | The test of ea0c0dfa64f5c614bfd728f323d9b6731ee4898c is not valid for the change introduced in that commit. QCoreApplication does not use the event loop of Cocoa. This is the same test in QApplication.
| | * Fix the test tst_QCoreApplication::sendEventsOnProcessEvents()Benjamin Poulain2009-09-221-3/+1
| | | | | | | | | | | | | | | The test is failing when Qt is compiled with Qt 3 support. Qt 3 support send events for the insertion of the new child.
| | * fix QPixmap::fromWinHICON for Windows CE mobileJoerg Bornemann2009-09-221-3/+20
| | | | | | | | | | | | | | | | | | On WinCE GetIconInfo returns a 0 hotspot for the system icons, thus we cannot use this value to determine width / height of the icon. Instead, we use the icon's bitmap to get this information.
| | * QPixMap::fromWinHICON compile fix for Windows CEJoerg Bornemann2009-09-221-11/+12
| | | | | | | | | | | | Reviewed-by: thartman
| | * Fix "make sis" target for -xplatform symbian-sbsv2Shane Kearns2009-09-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | CFG_PATH evaluates as "udeb", not "UDEB" when building the debug-armv5 target. So changed the FLM to check for that. Also changed the variable redefinition to ifeq/else/endif. Reviewed-by: Iain
| | * Docs: Fix spelling and reword docs about S60 specifics.Daniel Molkentin2009-09-222-6/+8
| | | | | | | | | | | | Reviewed-By: TrustMe
| | * Fix tst_QFileInfo::isHidden_data() with /bin on Mac OS XBenjamin Poulain2009-09-221-1/+4
| | | | | | | | | | | | | | | On Mac OS X, the directory /bin is hidden because it does not have the "Visible" attribute in the filesystem.
| | * Inverts the SortOrder in graphics scene to reflect the stacking orderLeonardo Sobral Cunha2009-09-228-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | Inverted all references of Qt::AscendingiOrder <-> Qt::DescendingOrder to make the order parameter consistent with the stacking order, as stated in the docs. The graphics scene index was using the wrong ordering convention. Reviewed-by: andreas
| | * make sure the engine's currentFrame is in sync when calling out to public APIKent Hansen2009-09-223-1/+32
| | | | | | | | | | | | | | | | | | | | | The currentFrame pointer is used e.g. by QScriptValue::toString(). It needs to be in sync, otherwise we will crash. Reviewed-by: Olivier Goffart
| | * Fixed background gradients in ObjectBoundingModeGunnar Sletta2009-09-221-2/+8
| | | | | | | | | | | | Reviewed-by: Samuel
| | * fix failing qdir autotestShane Kearns2009-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | File engine was adding '/' to the result of QDir::cleanPath(), which is correct for everything except root directories, where it caused a path like "c://" Reviewed-by: axis
| | * Fix crashes in QApplication autotestShane Kearns2009-09-222-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | 1) Input methods caused crash due to using CCoeEnv::Fep() without checking for NULL pointer 2) Autotest itself had Q_ASSERT where it should have used Q_VERIFY Reviewed-by: axis
| | * Fix "... may return wrong private dir if application is on Z:, not C:"Shane Kearns2009-09-221-32/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT-805 QCoreApplication::applicationDirPath() may return wrong private dir if application is on Z:, not C: Remove the emulator ifdef, instead RFs::Drive is used to get the drive attributes (to see if it is ROM / read only) RFs::SystemDrive is used to get the system drive, which is C: on S60 phones, but in theory configurable. It is not needed to call Open() on RProcess to call functions on the current process - this eliminates some code. Elimated some unneeded code to check for Z: before creating prvate path (now, the if statement would always have evaluated the same) Task-number: QT-805 Reviewed-by: Miikka Heikkinen
| | * Doc: Moved the note about QFileSystemModel to the start of the document.David Boddie2009-09-221-4/+4
| | | | | | | | | | | | Reviewed-by: Alexis Ménard
| | * Fix focus scope bugs, verified against examples in kinetic-declarativeui.Andreas Aardal Hanssen2009-09-223-36/+25
| | | | | | | | | | | | | | | | | | | | | The C++ autotests have been updated to match the expected behavior of the examples that broke (e.g., listview.qml) in kinetic-declarativeui. Reviewed-by: Alexis
| | * Missing mouse release event on toolbars on Mac OS XPrasanth Ullattil2009-09-221-0/+2
| | | | | | | | | | | | | | | | | | | | | The mouse move events were eaten regardless of the dragging state. Task-number: 238004 Reviewed-by: Thierry
| | * Fix a regression in 4.6 in icon mode for QListViewThierry Bastian2009-09-221-1/+1
| | | | | | | | | | | | | | | | | | We were not restoring the hidden rows correctly. Reviewed-by: Jan-Arve
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-221-1/+1
| | |\
generated by cgit v0.12 at 2025-01-03 22:02:42 (GMT)