summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update EABI DEF files for Symbian OSIain2009-10-205-10/+55
| | | | Reviewed-by: TrustMe
* fix widget activation from minimized state on Windows mobileJoerg Bornemann2009-10-191-0/+2
| | | | | | | | | | | | The following didn't work on Windows mobile: * show a widget normal (non-maximized) * minimize it * reactivate it via the file explorer * now the widget should be visible again The code path from minimized to normal state was missing. Reviewed-by: thartman
* fix bug in tst_qwidget.cppJoerg Bornemann2009-10-191-4/+6
| | | | | | WinIdChangeEventWidget::event didn't return a value in all codepaths. Reviewed-by: thartman
* qwidget_wince.cpp: don't invalidate the crect on maximizeJoerg Bornemann2009-10-191-14/+4
| | | | | | | If we do this, QWidget::width() returns negative sizes, which makes QGraphicsView crash. Reviewed-by: thartman
* qwindowsmobilestyle.cpp: endif comment fixedJoerg Bornemann2009-10-191-1/+1
|
* QTestLib: do not assert if testLogger object is already destroyedPeter Hartmann2009-10-191-2/+2
| | | | | | | | ... because when dumping signals we might get QThread::finished() etc. when closing the program, and then the testLogger instance might already be deleted. Reviewed-by: Jesper
* Reimplementing QDate/QTime/QDateTime in Symbian native mannerAleksandar Sasha Babic2009-10-191-1/+61
| | | | | | | Some of the methods used in QDate/QTime/QDateTime have been reimplemented to use native Symbian calls. Reviewed-by: Janne Anttila
* Fix doc error.Jason Barron2009-10-191-1/+1
| | | | | | Should *not* be used as a softkey. Reviewed-by: TrustMe
* Fixed the build for people who only have emulator binaries installedaxis2009-10-191-1/+1
| | | | RevBy: mread
* Fluidlauncher now comes to foreground when child application dies.Miikka Heikkinen2009-10-191-0/+4
| | | | | Task-number: QT-2162 Reviewed-by: axis
* Fixed QWidget::raise in SymbianMiikka Heikkinen2009-10-191-1/+6
| | | | | | | | If toplevel window is raised, the whole application is now raised to foreground. Task-number: QT-2162 Reviewed-by: axis
* setcepaths: add support for wincewm65professional-msvc200? mkspecsJoerg Bornemann2009-10-191-0/+10
| | | | Reviewed-by: mauricek
* QTestLib: do not assert if file is not given in logging functionPeter Hartmann2009-10-191-1/+0
| | | | | | | that assert was triggered when running a test with "-vs" to show all the signals emitted. Reviewed-by: Andy Shaw
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-19256-5633/+5909
|\
| * qdoc3: Added the \qmlattachedproperty command.Martin Smith2009-10-195-17/+56
| | | | | | | | | | | | It works just like the \qmlproperty command, except that it puts the properties in a different section for attached properties.
| * Regression fix. Fix the hasUncaughtException() flag in debugger's event.Jedrzej Nowacki2009-10-195-3/+57
| | | | | | | | | | | | | | | | | | | | | | The QScriptEngine::hasUncaughtException() flag should be set to true if returning from a JS function was caused by an exception. According to documentation, the flag had to be accessible from the QScriptEngineAgent::functionExit event. New autotest was added. Reviewed-by: Kent Hansen
| * Fix crash in QPixmapCache.David Faure2009-10-191-0/+1
| | | | | | | | | | | | | | QCache destruction accesses the key array that was freed in the QPixmapCache destruction, so better clear() before deleting that key. Merge-request: 1820 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| * QSslSocket: Also handle setSocketOptionMarkus Goetz2009-10-193-0/+33
| | | | | | | | | | | | | | Handle setSocketOption and forward it to the plainSocket that QSslSocket is using internally. Reviewed-by: Thiago
| * Made sure the noSocketEvents value is preserved in case of exception.axis2009-10-191-3/+3
| | | | | | | | | | Task: QT-987 RevBy: mread
| * Made Mac Carbon use the input method hints when deciding on IM.axis2009-10-191-1/+5
| | | | | | | | | | | | | | | | | | New behavior is to turn them off when inputting numbers or hidden text, which is the way it was in Qt 4.5. Task: QT-1938 Task: QT-2257 RevBy: Prasanth Ullattil
| * Fix autotest case for QSoftkeyManagerSami Merilä2009-10-191-10/+46
| | | | | | | | | | | | | | | | | | | | | | | | QSoftkeyManager's test case checkSoftkeyEnableStates was broken with recent fix to QSoftkeyManager where softkey action is no longer initialized to the initial state of action widget. Instead, softkey action checks the state of action widget when handling the action. Autotest case is now fixed to handle the change. Task-number: N/A Reviewed-by: Miikka Heikkinen
| * Remove debug output.Morten Johan Sørvig2009-10-191-1/+0
| |
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-191-0/+25
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Peter Yard2009-10-191-1/+1
| | |\
| | * | Additional documentation added to deployment.qdoc which lists the process ↵Peter Yard2009-10-191-0/+25
| | | | | | | | | | | | | | | | and links to the original MSDN pages which describe it in full.
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-19433-33829/+43712
| |\ \ \ | | | |/ | | |/|
| | * | ODBC: Retrieved in ascii, should be stored in ascii.Bill King2009-10-191-1/+1
| | |/ | | | | | | | | | | | | | | | For non-unicode databases, use ascii. Task-number: QTBUG-3736
| | * Merge branch '4.5' into 4.6Thiago Macieira2009-10-161-1/+6
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/gui/egl/qegl_symbian.cpp
| | | * QNetworkProxyFactory: Never return empty list on windowsMarkus Goetz2009-10-161-1/+6
| | | | | | | | | | | | | | | | | | | | Task-number: Salesforce 00062670 Reviewed-by: Thiago
| | | * Recognize transformed screens when looking for a QGLScreenRhys Weatherley2009-10-162-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the QWS_DISPLAY is specified as "Transformed:powervr:...", then we will encounter QScreen::TransformedClass rather than QScreen::ProxyClass when searching for the QGLScreen. This change makes the code search for both. Task-number: QT-2261 Reviewed-by: Sarah Smith Back port of 8e4fa6e87f74cfb3457e8270a361cf30ca7d3593
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-10-163-346/+69
| | |\ \
| | | * | Refactored SymbianSubdirsMetaMakefileGenerator out of qmake.Miikka Heikkinen2009-10-163-346/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was no need to have SymbianSubdirsMetaMakefileGenerator in cross-platform metamakefile.cpp, so moved the Symbian specific functionality to symmake.cpp as suggested by qmake reviewers. Task-number: QT-822 Reviewed-by: Janne Anttila
| | * | | Doc: Documentation for gesture features. Still a moving target.David Boddie2009-10-1615-26/+1246
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Doc: Moving the Image Gestures example.David Boddie2009-10-167-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Doc: Gesture API documentation review and improvements.David Boddie2009-10-1615-1838/+170
| | |/ / | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Fix tst_QMenu on Symbian.Liang QI2009-10-161-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For tst_QMenu::activeSubMenuPosition, QS60Style::pixelMetric(QStyle::PM_SubMenuOverlap) is different with other styles. For tst_QMenu::menuSizeHint, Softkey actions are not widgets and have no geometry. For tst_QMenu::task258920_mouseBorder, QS60Style::styleHint(QStyle::SH_Menu_MouseTracking) is false. RevBy: Shane Kearns RevBy: axis
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-10-165-11/+5
| | |\ \
| | | * | doc: Changed Trolltech to NokiaMartin Smith2009-10-161-1/+1
| | | | |
| | | * | doc: Corrected typo.Martin Smith2009-10-161-1/+1
| | | | |
| | | * | build: Removed alternative definition for ADP_DOCS_QDOCCONF_FILEMartin Smith2009-10-161-5/+1
| | | | | | | | | | | | | | | | | | | | It used a qdocconf file that no longer exists; something for xcode.
| | | * | Removed unnecessary include from a public header file.axis2009-10-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QT-2265 RevBy: Janne Anttila Compiles on all three Symbian compilers. Strictly speaking GCCE wasn't able to link QtGui, but that seemed to be unrelated to this change.
| | | * | Fixed `-debug' option to cetest deploying release DLLs.Rohan McGovern2009-10-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cetest was processing .pro files without build_pass set. That's wrong, as it means the qmake logic is set up for generating the debug-and-release glue project instead of the real project. Until commit 75b41faff44a1488d88eca6e910d4b617cb42221, it didn't matter. After that commit, cetest would always try to deploy release versions of Qt DLLs even when run with `-debug'. Reviewed-by: joerg
| | * | | Softkeys remain disabled if action owning action widget is enabledSami Merilä2009-10-165-13/+13
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softkeys have a QAction that is related to some action widget. The initial state of the action was set according the state of action widget (enabled/disabled). Now, if action widget's state changes, the softkey's action remain in the initial state. This was fixed by removing the enable/disable from the QAction and instead use the real state of action widget when handling the command of softkey. Task-number: QTBUG-4619 Reviewed-by: Janne Anttila
| | * | doc: Fixed the wording in some \brief commands.Martin Smith2009-10-162-2/+2
| | | |
| | * | Networking documentation: Small improvementMarkus Goetz2009-10-163-3/+5
| | | | | | | | | | | | | | | | | | | | Task-number: 262144 Reviewed-by: TrustMe
| | * | Fixed uitools.prf to include QtUiTools.lib statically in SymbianMiikka Heikkinen2009-10-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using just -lQtUiTools instead of -lQtUiTools.lib will make qmake attempt to autodetect whether or not the lib is static or dynamic, which will not work since QtUiTools is not necessarily yet built. Task-number: QT-1018 Reviewed-by: Janne Koskinen
| | * | Corrected QT_BUILD_PARTS handling for Symbian in projects.pro.Miikka Heikkinen2009-10-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed QT_BUILD_PARTS to be set in projects.pro only when it's empty also in Symbian, since configure now correctly sets it in .qmake.cache. Task-number: QT-1018 Reviewed-by: Janne Koskinen
| | * | Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-16104-1332/+1761
| | |\ \
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-160-0/+0
| | | |\ \
| | | | * \ Merge commit 'v4.6.0-beta1' into 4.6Thiago Macieira2009-10-160-0/+0
| | | | |\ \