summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make default application deployment removableMiikka Heikkinen2010-11-086-101/+61
| | | | | | | | | | | | | | | | | Default application deployment was hard coded in qmake, so it was impossible to replace with custom deployment. Now the default deployment is generated via .prf files and is removable. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 494ce0dac35c7ade0ce78589878597a7ca912864 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: axis Conflicts: qmake/generators/symbian/symbiancommon.cpp
* Allow pkg_prerules and pkg_postrules to be targeted to separate filesMiikka Heikkinen2010-11-084-85/+197
| | | | | | | | | | | | | | | | | | | | Pkg_prerules and pkg_postrules can now be targeted to apply only to main template pkg, installer pkg, or stub pkg file using .main, .installer, or .stub suffix on the variable. Also clarified documentation of these variables. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: a537137fffd72d153a35828228c00567a563e787 Task-number: QTBUG-15068 Task-number: QTBUG-13159 Reviewed-by: axis Conflicts: doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.qdoc
* Added missing def file symbol.axis2010-11-081-0/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-089-14/+121
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Use qtmain.lib to provide entry point for all Symbian applications" Fixed test after the fix to QT-4077. Fixed event starvation with pointer events on Symbian.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-069-14/+121
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Use qtmain.lib to provide entry point for all Symbian applications" Fixed test after the fix to QT-4077. Fixed event starvation with pointer events on Symbian.
| | * Revert "Use qtmain.lib to provide entry point for all Symbian applications"axis2010-11-053-7/+19
| | | | | | | | | | | | | | | | | | | | | This reverts commit 564058a1bbfb1c67bc3d68b7c7a2ebfe83481334. It breaks massively on the symbian/linux-armcc mkspec. Will find a different solution.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-056-7/+102
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed test after the fix to QT-4077. Fixed event starvation with pointer events on Symbian.
| | | * Merge branch 'QT-4077-fix' into 4.7-s60axis2010-11-056-7/+102
| | | |\
| | | | * Fixed test after the fix to QT-4077.axis2010-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the events are balanced now, we need to give them time to get through. RevBy: Trust me
| | | | * Fixed event starvation with pointer events on Symbian.axis2010-11-055-5/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CEikonEnv active object is used by Symbian to indicate that new window server events are available, in this case pointer events. Since this object was being controlled by Symbian, it was not subject to Qt's round robin queue. In a case where the event handler for the pointer event would take very long, it was possible for the active object to be completed again before the previous handler was finished, causing it to be called in a loop. This was fixed by making a new Qt-owned class as a subclass of CEikonEnv, and in its RunL, make sure that the object follows the round-robin queue. Because the round robin code is located in a subclass of CEikonEnv that we own, the fix will have no effect if Qt is loaded after the Eikon framework (such as a Qt plugin in a non-Qt app). Task: QT-4077 RevBy: mread AutoTest: N/A, system events
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Task-number: QTBUG-15059
| * | | | Task-number: QTBUG-15059juhvu2010-11-081-1/+1
|/ / / / | | | | | | | | | | | | | | | | Removed implicit QtGui linking from qsymbianbearer plugin as it is not needed.
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-051-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Hide the cursor in the tested text edit
| * | | | Hide the cursor in the tested text editHarald Fernengel2010-11-051-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hiding the cursor will make the image comparison more robust. This fixes the sporadic test fail we saw on some machines - every time the blinking cursor was visible, the test failed. Reviewed-by: Robert Griebl
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-051-0/+81
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_qnetworkreply: New HTTP test with AuthenticationReuseAttribute tst_qnetworkreply: One more HTTP test using setReadBufferSize()
| * | | tst_qnetworkreply: New HTTP test with AuthenticationReuseAttributeMarkus Goetz2010-11-051-0/+29
| | | |
| * | | tst_qnetworkreply: One more HTTP test using setReadBufferSize()Markus Goetz2010-11-051-0/+52
| | | | | | | | | | | | | | | | Task-number: QTBUG-13431
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-0546-221/+623
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits) Give the toplevel widget a layout fix tests when using Qt in a namespace Fix tst_symbols auto test trivial: fix build Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget ...
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-0446-221/+623
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits) Give the toplevel widget a layout fix tests when using Qt in a namespace Fix tst_symbols auto test trivial: fix build Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget ...
| | * | | Give the toplevel widget a layoutHarald Fernengel2010-11-041-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the top-level will be large enough to view the text edit.
| | * | | fix tests when using Qt in a namespaceHarald Fernengel2010-11-041-0/+2
| | | | |
| | * | | Fix tst_symbols auto testHarald Fernengel2010-11-043-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Prefix isLikelyToBeNfs with a "q", even though it's only autotest-exported.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-0445-220/+613
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (53 commits) trivial: fix build Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget Fixed QMenu autotest to use a dummy toplevel widget Fixed QMenuBar autotest. Added mainwindow activation Fixed QString autotest when QT_QLOCALE_USES_FCVT is set ...
| | | * | | trivial: fix buildHarald Fernengel2010-11-031-2/+2
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-0345-220/+613
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (52 commits) Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget Fixed QMenu autotest to use a dummy toplevel widget Fixed QMenuBar autotest. Added mainwindow activation Fixed QString autotest when QT_QLOCALE_USES_FCVT is set Fixed QButtonGroup autotest to run on Maemo ...
| | | | * | | Fix crashHarald Fernengel2010-11-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check the global network proxy for 0 before dereferencing Reviewed-by: Robert Griebl
| | | | * | | fix isLikelyToBeNfs usageHarald Fernengel2010-11-021-2/+4
| | | | | | |
| | | | * | | Export isLikelyToBeNfs only if we have an internal buildHarald Fernengel2010-11-021-4/+10
| | | | | | |
| | | | * | | Fixed QGraphicsView autotest to use a dummy toplevel widgetDominik Holland2010-11-021-46/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some conversion problems using qreal
| | | | * | | Fixed QMdiArea autotest to use a dummy toplevel widget.Dominik Holland2010-11-021-4/+15
| | | | | | |
| | | | * | | Fixed QMenuBar autotest. Changed window activation order.Dominik Holland2010-11-021-1/+1
| | | | | | |
| | | | * | | Fixed QStyleSheetStyle autotest to use a dummy toplevel widgetDominik Holland2010-11-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -use platform quirks to skip tests
| | | | * | | Fixed QPathCliper autotest, to skip a test when qreal != doubleDominik Holland2010-11-021-0/+3
| | | | | | |
| | | | * | | Fixed QComboBox autotest to use a dummy toplevel widgetDominik Holland2010-11-021-6/+8
| | | | | | |
| | | | * | | Fixed QColumnView autotest. Added an QApplication::processEventsDominik Holland2010-11-021-0/+2
| | | | | | |
| | | | * | | Fixed QAccessability autotest to use a dummy toplevel widgetDominik Holland2010-11-021-3/+5
| | | | | | |
| | | | * | | Fix QListWidget testRalf Engels2010-11-021-0/+1
| | | | | | |
| | | | * | | Fix QGraphicsItems autotestRalf Engels2010-11-021-0/+2
| | | | | | |
| | | | * | | Fixed QGraphicsScene autotest to use a dummy toplevel widgetDominik Holland2010-11-021-3/+9
| | | | | | |
| | | | * | | Fixed QGraphicsItem autotest to use a dummy toplevel widgetDominik Holland2010-11-021-19/+48
| | | | | | |
| | | | * | | Fixed QListView autotest to use a dummy toplevel widgetDominik Holland2010-11-021-14/+21
| | | | | | |
| | | | * | | Fixed QMenu autotest to use a dummy toplevel widgetDominik Holland2010-11-021-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some waits
| | | | * | | Fixed QMenuBar autotest. Added mainwindow activationDominik Holland2010-11-021-0/+2
| | | | | | |
| | | | * | | Fixed QString autotest when QT_QLOCALE_USES_FCVT is setDominik Holland2010-11-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | +/-nan tests fail when QT_QLOCALE_USES_FCVT is set Because the behavior of qstrtod and strtod of glibc differs
| | | | * | | Fixed QButtonGroup autotest to run on MaemoDominik Holland2010-11-021-4/+5
| | | | | | |
| | | | * | | Fixed QGraphicsWidget autotest to use PlatformQuirks.Dominik Holland2010-11-021-2/+13
| | | | | | |
| | | | * | | Fixed QListWidget autotest to use a dummy toplevel widgetDominik Holland2010-11-021-2/+10
| | | | | | |
| | | | * | | Fixed QTreeView autotest to use a dummy toplevel widgetDominik Holland2010-11-021-10/+13
| | | | | | |
| | | | * | | Fixed QTreeWidget autotest. Added qWaitForWindowShown()Dominik Holland2010-11-021-0/+1
| | | | | | |
| | | | * | | Fixed QGraphicsEffect autotest to use platform quirksDominik Holland2010-11-021-1/+5
| | | | | | |
generated by cgit v0.12 at 2024-12-29 07:21:43 (GMT)