summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2872-43/+12957
|\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Wrong geometery for QMainWindow with Unified toolbar on Cocoa. Statically link to Qt based dependent librarys. Add libgq version 0.4+0m6. Add libconninet version 0.41+0m6.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2872-43/+12957
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Wrong geometery for QMainWindow with Unified toolbar on Cocoa. Statically link to Qt based dependent librarys. Add libgq version 0.4+0m6. Add libconninet version 0.41+0m6.
| | * Wrong geometery for QMainWindow with Unified toolbar on Cocoa.Prasanth Ullattil2010-07-283-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a mainwindow is shown maximized (initially) with unified toolbar, the top portion of the widget gets hidden underneath the native toolbar. This is because while showing the window, the toolbar is resized. Which causes the client area of the NSWindow to resize, we need to update the frame of the NSView for QMainWindow based on this new size. Task-number: QTBUG-10500 Reviewed-by: Denis
| | * Merge remote branch 'staging/4.7' into bearermanagement/icd-static-libsAaron McCarthy2010-07-2811-138/+260
| | |\
| | * | Statically link to Qt based dependent librarys.Aaron McCarthy2010-07-283-43/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the library dependencies of the ICD Bearer Management plugin use Qt. We include them in src/3rdparty and link against them statically to avoid the circular build dependency. Libraries that do not use Qt are still linked dynamically. The libraries which are statically linked are libconninet and libgq-gconf. Task-number: QTBUG-12354
| | * | Add libgq version 0.4+0m6.Aaron McCarthy2010-07-2826-0/+2830
| | | | | | | | | | | | | | | | | | | | | | | | libgq is required by the ICD Bearer Management plugin. Task-number: QTBUG-12354
| | * | Add libconninet version 0.41+0m6.Aaron McCarthy2010-07-2840-0/+10072
| | | | | | | | | | | | | | | | | | | | | | | | libconninet is required by the ICD Bearer Management plugin. Task-number: QTBUG-12354
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-2821-31/+759
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMenu and QStyleSheetStyle: fix setting a border. tst_qlistview: use QTRY_COMPARE Fix compilation on 64-bit Windows. Fix missing license header Add test for getting a backtrace in QML Doc: add link to new gettings started to index.html Doc: Added new getting started document. QtDeclarative: Give name to function bindings and signals.
| * | | QMenu and QStyleSheetStyle: fix setting a border.Olivier Goffart2010-07-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native border would be drawn over the one drawn by the QStyleSheetStyle Regression since 68a498284e206e2bb000bc35331c966f3790f607 Reviewed-by: Gabriel Task-number: QTBUG-10785
| * | | tst_qlistview: use QTRY_COMPAREOlivier Goffart2010-07-281-1/+1
| | | |
| * | | Fix compilation on 64-bit Windows.Kim Motoyoshi Kalland2010-07-281-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling for 64-bit with Visual Studio 2008, inline assembly is not supported. Use intrisic instead. Reviewed-by: Benjamin Poulain
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-2818-5/+743
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix missing license header Add test for getting a backtrace in QML Doc: add link to new gettings started to index.html Doc: Added new getting started document. QtDeclarative: Give name to function bindings and signals.
| * | | Fix missing license headerOlivier Goffart2010-07-281-0/+26
| | | |
| * | | Add test for getting a backtrace in QMLOlivier Goffart2010-07-284-0/+212
| | | |
| * | | Doc: add link to new gettings started to index.htmlGeir Vattekar2010-07-281-1/+1
| | | |
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-07-2880-193/+400
| |\ \ \
| | * | | QtDeclarative: Give name to function bindings and signals.Olivier Goffart2010-07-287-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, bindings and signals are annonymous javascript functions. If one give them a name, a proper name is then shown in the javascript debugger. Reviewed-by: Aaron Kennedy
| * | | | Doc: Added new getting started document.Geir Vattekar2010-07-286-0/+490
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-282-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Fixed a parsing error during sis and runonphone target creation."
| * | | | Revert "Fixed a parsing error during sis and runonphone target creation."axis2010-07-282-2/+2
| | |/ / | |/| | | | | | | | | | This reverts commit ebe6a5238947c30a613b61b521cb0d094efa2d02.
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2810-122/+220
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cherry pick fix for MOBILITY-1234 from Qt Mobility. Cherry pick fix for QTMOBILITY-408 from Qt Mobility. Cherry pick fix for MOBILITY-1194 from Qt Mobility. Fix compilation error on Symbian^4. Fix detection of OCC functionality. Cherry pick fix for MOBILITY-1194 from Qt Mobility.
| * | | Merge commit '9814b2225b70d6b2f758e9dbe98f8e1662049b37' into oslo-staging-1Aaron McCarthy2010-07-2810-122/+220
| |\ \ \
| | * | | Cherry pick fix for MOBILITY-1234 from Qt Mobility.Aaron McCarthy2010-07-281-0/+2
| | | | | | | | | | | | | | | | | | | | e51af0d74f8bb6ca6100d2338671d2d053bfed01
| | * | | Cherry pick fix for QTMOBILITY-408 from Qt Mobility.Aaron McCarthy2010-07-282-33/+34
| | | | | | | | | | | | | | | | | | | | 7f9a8ebcfe86d3df428707888c3ab5fcd10226a4
| | * | | Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-283-24/+68
| | | | | | | | | | | | | | | | | | | | f84bb604d745c512db8d53410c5fec835309f85e
| | * | | Fix compilation error on Symbian^4.Aaron McCarthy2010-07-283-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | The root cause is failing compilation test for SNAP when it shouldn't, but it should still not result in compilation errors in code.
| | * | | Fix detection of OCC functionality.Aaron McCarthy2010-07-281-1/+1
| | | | |
| | * | | Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-286-53/+104
| | | | | | | | | | | | | | | | | | | | 2f582953ecfc53f217317f58e4fc75b5b51a1126
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-07-281-16/+40
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Make tst_qdatetime failures more verbose.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-07-271-16/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Make tst_qdatetime failures more verbose.
| | * | | | Make tst_qdatetime failures more verbose.Rohan McGovern2010-07-271-16/+40
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-281-1/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Make it possible again to build Qt without webkit
| * | | | | Make it possible again to build Qt without webkitSimon Hausmann2010-07-271-1/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the QT_CONFIG line from the qt_webkit_version.pri file in Qt, because it is only meaningful for separate builds of WebKit. (Real fix is in the import script that takes care of always removing that line) Task-number: QTBUG-12456 Discussed-with: axis
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2764-157/+278
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Adding missing image Fix QT_NO_DATESTRING Check the gesturemanager pointer before accessing it. Added files that had been renamed. Modified file/directory names and text to remove disallowed terminology. Cherry pick fix for MOBILITY-1077 from Qt Mobility. Fix typo in docs. Cherry pick fix for MOBILITY-1145 from Qt Mobility. Cherry pick fix for MOBILITY-1144 from Qt Mobility. Fixed the following sub-tasks for QTBUG-12192
| * | | | | Adding missing imageKevin Wright2010-07-271-0/+0
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2764-157/+278
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QT_NO_DATESTRING Check the gesturemanager pointer before accessing it. Added files that had been renamed. Modified file/directory names and text to remove disallowed terminology. Cherry pick fix for MOBILITY-1077 from Qt Mobility. Fix typo in docs. Cherry pick fix for MOBILITY-1145 from Qt Mobility. Cherry pick fix for MOBILITY-1144 from Qt Mobility. Fixed the following sub-tasks for QTBUG-12192
| | * | | | Fix QT_NO_DATESTRINGTasuku Suzuki2010-07-275-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 730 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | * | | | Check the gesturemanager pointer before accessing it.Denis Dzyubenko2010-07-273-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a crash when a static QWidget is destroyed after the QApplication object. Task-number: QTBUG-12025 Reviewed-by: Zeno Albisser
| | * | | | Merge branch '4.7' of http://git.scm.dev.nokia.troll.no/qt/oslo-staging-1 ↵Kevin Wright2010-07-2752-79/+809
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into 4.7
| | | * \ \ \ Merge commit 'c16f0a839743af36b36aea9c35f0d5ddfda3d6ac' into oslo-staging-1Aaron McCarthy2010-07-274-8/+32
| | | |\ \ \ \ | | | | |/ / / | | | |/| / / | | | | |/ /
| | | | * | Cherry pick fix for MOBILITY-1077 from Qt Mobility.Aaron McCarthy2010-07-272-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ef45318255c5cf1f10508753c9a2c55fc2cb8c0 321bd8b7b54e34a983b1ba142af836cf3e153a66
| | | | * | Fix typo in docs.Aaron McCarthy2010-07-271-1/+1
| | | | | |
| | | | * | Cherry pick fix for MOBILITY-1145 from Qt Mobility.Aaron McCarthy2010-07-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | f17d8a5dbef076046ff504fecb1fd445c9b785ac
| | | | * | Cherry pick fix for MOBILITY-1144 from Qt Mobility.Aaron McCarthy2010-07-271-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | 426ff79e49d4abb659167541bb67846443b9707e
| | * | | | Added files that had been renamed.Kevin Wright2010-07-2728-0/+1605
| | | | | |
| | * | | | Modified file/directory names and text to remove disallowed terminology.Kevin Wright2010-07-2737-1623/+30
| | | | | |
| | * | | | Fixed the following sub-tasks for QTBUG-12192Kevin Wright2010-07-2613-80/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Qt Simulator link missing * Integration and add-ins (on the front page, link leads to an alternative start page) * Qt Creator (on the front page link leads to Manual version 1.3) * Getting Started (on the front page) link broken * More... (in Global Declarations) link broken Additionally: There was an issue with the documentation used within Assistant/Creator that appears to have no bug report filed. An alternate "offline" form of the documentation (inspired by the newly redesigned online version) was being installed, but had significant issues within Assistant and Creator. It appears that within qdoc3 some changes had been made towards using this newer documentation format, but those changes were not working properly. I fixed qdoc3 so that the original offline documentation design is the default, but there is room to use the configuration files to call the any of the three documentation designs (new online, new offline, and old offline).
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-2716-97/+389
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't run the QGL test on systems that does not have GL support. Remove an useless assert from comp_func_SourceOver_sse2() QScriptEngineAgent: recompile all the function when installing a debugger. QScriptDeclarativeObject: we need to save the current stack pointer. QScriptValue::objectId(): do not assert if the value is not a cell Implement the composition mode "Plus" with SSE2 Clean the CompositionFunction tables of drawhelper
| * | | | | | Don't run the QGL test on systems that does not have GL support.Trond Kjernåsen2010-07-271-1/+26
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a Mac that has no screens connected, it is possible to create offscreen GL contexts, but not normal QGLWidgets. There are some assumptions both in the tests and in the QGL module that this if you can create one of them, you can create both. The test now check if it can create a valid QGLWidget, if it can't it will skip running all the QGL tests. Task-number: QTBUG-12138 Reviewed-by: Prasanth
| * | | | | Remove an useless assert from comp_func_SourceOver_sse2()Benjamin Poulain2010-07-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assert can never be true since const_alpha is unsigned. That line was triggering a warning on GCC. Reviewed-by: Olivier Goffart
generated by cgit v0.12 at 2025-09-04 06:06:21 (GMT)