summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-08-201-13/+13
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-207-45/+353
| |\ | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Doing "import foo.qml" doesn't work in QML anymore Add info to Loader docs about receiving signals and key events
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-191-13/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Ensure geometry of top-level widget accounts for S60 screen furniture
| | * | Ensure geometry of top-level widget accounts for S60 screen furnitureGareth Stockwell2010-08-191-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the S60 screen furniture has already been constructed before QWidgetPrivate::show_sys() is called on a top-level widget which has Qt::WindowMaximized set (e.g. due to a showMaximized() call), its geometry is set to the full screen extent, including the regions covered by the status bar and CBA. This patch ensures that calculation of the widget geometry always takes into account the screen furniture. Task-number: QTBUG-12605 Reviewed-by: Jason Barron
* | | | Add a quit button to declarative examples in QtDemoAlan Alpert2010-08-201-33/+25
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-08-2045-222/+783
|\ \ \ \ | | |_|/ | |/| |
| * | | Doing "import foo.qml" doesn't work in QML anymoreBea Lam2010-08-201-6/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-13042
| * | | Add info to Loader docs about receiving signals and key eventsBea Lam2010-08-206-39/+349
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-194-8/+43
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fatal crash on solaris 64 bit qdoc: Added more elements to qt.pageindex doc: Removed comment about automatic inclusion of 3rd party library. qdoc3: Added more pagewords & elements to the search index. qdoc3: Added more pagewords & elements to the search index.
| | * Fatal crash on solaris 64 bitCarlos Manuel Duclos Vergara2010-08-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | We use a dummy variable for a function call, and that variable is causing a data misalignment. Changing the type to long fixes the issue. According to Denis it is ok to change this for all cases. Task-number: QTBUG-12928 Reviewed-by: Denis Dzyubenko
| | * qdoc: Added more elements to qt.pageindexMartin Smith2010-08-191-0/+29
| | | | | | | | | | | | Task-nr: QTBUG-11113
| | * doc: Removed comment about automatic inclusion of 3rd party library.Martin Smith2010-08-191-4/+2
| | | | | | | | | | | | It must be copied into the appliv=cation bundle automatically.
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-199-12/+4
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-191-0/+6
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc3: Added more pagewords & elements to the search index.
| | * | | qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-192-3/+4
| | | |/ | | |/| | | | | | | | | Task-nr: QTBUG-11113
| | * | qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-0/+6
| | | | | | | | | | | | | | | | Task-nr: QTBUG-11113
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-198-28/+131
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes a regression preventing loading images without extensions Made GL pixmap backend respect Qt::NoOpaqueDetection flag.. QTextCodec: fix wodring of a comment QDeclarativeImageProvider: Do not keep the global declarative mutex locked when processing.
| | * | Fixes a regression preventing loading images without extensionsThierry Bastian2010-08-192-8/+13
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12560 Reviewed-by: gabi
| | * | Made GL pixmap backend respect Qt::NoOpaqueDetection flag..Samuel Rødal2010-08-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to do the opaque image scan when the Qt::NoOpaqueDetection flag is set. Reviewed-by: Trond
| | * | QTextCodec: fix wodring of a commentOlivier Goffart2010-08-191-2/+4
| | | |
| | * | QDeclarativeImageProvider: Do not keep the global declarative mutex locked ↵Olivier Goffart2010-08-194-16/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when processing. The point is to be able to process images in a thread. If the mutex is locked, this is useless. Use case is a slow QDeclarativeImageProvider that generates thumbmails from large files. Even with the asynchronous attribute set to true, the gui thread would be blocked by the mutex. By using QSharedPointer, I also fix the leak of the providers (which were not deleted) Reviewed-by: Martin Jones
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-199-12/+4
| |\ \ \ | | |/ / | |/| | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix Image element svg autotest
| | * | Fix Image element svg autotestJoona Petrell2010-08-199-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, reduced some platform-specific test as the test case is not meant to test regression in the painting routines, but that Image's svg support works. Task-number: Reviewed-by: Martin Jones
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-192-25/+2
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: cleanup and remove __FUNCTION__, which breaks build on solaris
| | * cleanup and remove __FUNCTION__, which breaks build on solarisLorn Potter2010-08-192-25/+2
| | | | | | | | | | | | Task-number: QTBUG-12904
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1915-104/+250
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added license headers to new files. use intel linker and librarian with icc create missing output directories for substituted files fix shadow builds with scratchbox QMake/Win32/MinGW: Fix ar script generating with absolute paths Crash in QWidgetPrivate::init on QApplication::quit() using a modal dialog on Mac Crash in QX11PaintEngine::drawPixmap Revert "Fix the rendering of lines with the X11 paint engine" Revert "Outline / fill inconsistency in X11 paint engine."
| | * Added license headers to new files.Rohan McGovern2010-08-183-0/+123
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1815-104/+127
| | |\ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: use intel linker and librarian with icc create missing output directories for substituted files fix shadow builds with scratchbox QMake/Win32/MinGW: Fix ar script generating with absolute paths Crash in QWidgetPrivate::init on QApplication::quit() using a modal dialog on Mac Crash in QX11PaintEngine::drawPixmap Revert "Fix the rendering of lines with the X11 paint engine" Revert "Outline / fill inconsistency in X11 paint engine."
| | * use intel linker and librarian with iccOswald Buddenhagen2010-08-181-2/+2
| | | | | | | | | | | | | | | Reviewed-by: thiago Task-number: QTBUG-12937
| | * create missing output directories for substituted filesOswald Buddenhagen2010-08-183-4/+4
| | | | | | | | | | | | | | | | | | it wasn't the fault of fileFixify() after all ... Reviewed-by: joerg
| | * fix shadow builds with scratchboxOswald Buddenhagen2010-08-181-3/+8
| | | | | | | | | | | | | | | | | | | | | seems it doesn't grok xargs -I. as some other unixes don't grok cp -s, we have two paths now ... Reviewed-by: joerg
| | * QMake/Win32/MinGW: Fix ar script generating with absolute pathsTuomas Suutari2010-08-181-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QMake decides to use absolute path for some object file, this code used to leave the ADDMOD command out from the ar object script, which resulted in following errors from the issued "ar -M" command: Syntax error in archive script, line 2 Syntax error in archive script, line 3 etc... And the build failed in the linking phase, because the generated static library was empty. Fix this issue by prepending the file name with ADDMOD command even if the file path is absolute. Task-number: QTBUG-12959 Merge-request: 2451 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Crash in QWidgetPrivate::init on QApplication::quit() using a modal dialog ↵Carlos Manuel Duclos Vergara2010-08-187-12/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on Mac The problem was the order of deletion in the destructor. To autotest this I create an application, start a modal dialog and then quit the application. The fix was contributed by a customer. Task-number: QTBUG-12673 Reviewed-by: Olivier Goffart
| | * Crash in QX11PaintEngine::drawPixmapCarlos Manuel Duclos Vergara2010-08-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We receive a pixmap as a const reference and then we convert it to an X11 pixmap. This conversion could fail for many reasons, however we were not looking at the result of this conversion. This patch was contributed by Christoph Feck from KDE. Task-number: QTBUG-12826 Reviewed-by: Samuel
| | * Revert "Fix the rendering of lines with the X11 paint engine"Samuel Rødal2010-08-182-75/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6, which broke fill / outline consistency, and when trying to fix that by rounding the fill the same way that broke rendering in Creator. Unfortunately the X11 paint engine is too sensitive to changes, there have already been tons of patches to make it as consistent as possible. It's simply not possible to get the same rounding for both fill and outlines and at the same time have consistency between fill and outline (no holes or fill outside the outline), while using the integer based Xlib rendering API. Hopefully in 4.8 we'll switch to raster and the X11 paint engine will be a legacy. Reviewed-by: Trond
| | * Revert "Outline / fill inconsistency in X11 paint engine."Samuel Rødal2010-08-181-4/+4
| | | | | | | | | | | | | | | | | | This reverts commit ff405f5623d7ed18c881c097368e3e9afd2e9443. Reviewed-by: Trond
* | | Without Declarative, still build and run QtDemoAlan Alpert2010-08-194-13/+33
|/ / | | | | | | | | | | | | If declarative is configured out then QtDemo will now still build, with all declarative demos disabled. Task-number: QTBUG-12983
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-181-0/+4
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: respect the layout direction in the default text option
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-181-0/+4
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: respect the layout direction in the default text option
| | * respect the layout direction in the default text optionLars Knoll2010-08-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression against 4.6 where setting the default layout direction for rich text got ignored Task-number: QT-3566 Reviewed-by: Jiang Jiang
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1821-4039/+359
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixing overlapping text in header list qdoc: Reorganized the QML elements table to be a dictionary... unbreak qmake autotest Update Polish translations Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15 Cocoa, Autotest: disable autotest that was added a bit premature make error messages consistent Add tests/benchmarks/README qgrayraster: Remove unnecessary indirection in QT_FT_Outline_Decompose Cocoa: add autotest to be more safe regarding child window stacking Fix compilation: QT_NO_TEXTSTREAM exclude QtXmlPatterns from the completeness assessment fix QMAKE_SUBSTITUTES with shadow builds Outline / fill inconsistency in X11 paint engine. Cocoa: parent windows shows on screen when they should be hidden Prevented Xorg crash in qtdemo when running corkboards example.
| * | | Doc: Fixing overlapping text in header listMorten Engvoldsen2010-08-181-1/+1
| | | |
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-1858-4262/+1382
| |\ \ \
| | * | | unbreak qmake autotestOswald Buddenhagen2010-08-181-4/+4
| | | | | | | | | | | | | | | | | | | | ok, that was a rather obvious braindamage ... :}
| | * | | Update Polish translationsJarek Kobus2010-08-182-3948/+19
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1816-55/+244
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15 Cocoa, Autotest: disable autotest that was added a bit premature make error messages consistent Add tests/benchmarks/README qgrayraster: Remove unnecessary indirection in QT_FT_Outline_Decompose Cocoa: add autotest to be more safe regarding child window stacking Fix compilation: QT_NO_TEXTSTREAM exclude QtXmlPatterns from the completeness assessment fix QMAKE_SUBSTITUTES with shadow builds Outline / fill inconsistency in X11 paint engine. Cocoa: parent windows shows on screen when they should be hidden Prevented Xorg crash in qtdemo when running corkboards example.
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1816-55/+244
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15 Cocoa, Autotest: disable autotest that was added a bit premature make error messages consistent Add tests/benchmarks/README qgrayraster: Remove unnecessary indirection in QT_FT_Outline_Decompose Cocoa: add autotest to be more safe regarding child window stacking Fix compilation: QT_NO_TEXTSTREAM exclude QtXmlPatterns from the completeness assessment fix QMAKE_SUBSTITUTES with shadow builds Outline / fill inconsistency in X11 paint engine. Cocoa: parent windows shows on screen when they should be hidden Prevented Xorg crash in qtdemo when running corkboards example.
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1716-55/+244
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15 Cocoa, Autotest: disable autotest that was added a bit premature make error messages consistent Add tests/benchmarks/README qgrayraster: Remove unnecessary indirection in QT_FT_Outline_Decompose Cocoa: add autotest to be more safe regarding child window stacking Fix compilation: QT_NO_TEXTSTREAM exclude QtXmlPatterns from the completeness assessment fix QMAKE_SUBSTITUTES with shadow builds Outline / fill inconsistency in X11 paint engine. Cocoa: parent windows shows on screen when they should be hidden Prevented Xorg crash in qtdemo when running corkboards example.
| | | | | * Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15Richard Moe Gustavsen2010-08-171-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that we tried to fix the stacking order of child windows while we fixed a crash. But the patch turned out to break an auto-test Reviewed-by: prasanth
| | | | | * Cocoa, Autotest: disable autotest that was added a bit prematureRichard Moe Gustavsen2010-08-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is actually correct, but cannot be enabled before a second revision on the setStackingOrder function in qwidget_mac.mm has been rewritten to handle inter-child window stacking order Reviewed-by: prasanth
generated by cgit v0.12 at 2024-11-13 14:52:54 (GMT)