summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-06-17 14:48:45 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-06-17 14:48:45 (GMT)
commitfe98842b7110c05b3588eccde8b45d7d1b5b768c (patch)
tree775d5caebf2025f51e6db5cac37f29b5fb996c6f
parent30525b802f17c2c815f02d81a1c771b8cee71458 (diff)
parent4a5a9b23f41afb062fae4aaab429fcef35b3d42c (diff)
downloadQt-fe98842b7110c05b3588eccde8b45d7d1b5b768c.zip
Qt-fe98842b7110c05b3588eccde8b45d7d1b5b768c.tar.gz
Qt-fe98842b7110c05b3588eccde8b45d7d1b5b768c.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
-rw-r--r--dist/changes-4.5.2-tower14
1 files changed, 12 insertions, 2 deletions
diff --git a/dist/changes-4.5.2-tower b/dist/changes-4.5.2-tower
index 41dc8c8..9d28465 100644
--- a/dist/changes-4.5.2-tower
+++ b/dist/changes-4.5.2-tower
@@ -198,6 +198,13 @@ Optimizations
* Fixed active scheduler removal when calling QThread::terminate
* Fix to Open C bug: select sometimes returns -1 and errno is
ECONNREFUSED
+- QWidget
+ * Added API for setting softkeys
+- QMenuBar
+ * Native menus are handled properly even when application has multiple QMainWindows
+ * Fixed a bug causing both native and qt menu to be created
+ * Fix for disappearing options menu after coming back from dialog
+
****************************************************************************
* Examples and demos *
@@ -224,12 +231,15 @@ Optimizations
since the issue has been fixed in qmake.
* Included drilldown to demonstrate QtSql usage
* Updated screenshots to S60 style
+ * Added softkeys example
+
+- Softkeys
+ * New example showing how to use softkeys API in QWidget
****************************************************************************
* Tools *
****************************************************************************
-
- qmake
* Support for generating Symbian "test" targets: CONFIG += symbian_test.
* Support for Symbian Build System, version 2 (aka Raptor) via
@@ -259,7 +269,7 @@ Optimizations
* Will now patch also vendor id.
****************************************************************************
-* Documnetation *
+* Documentation *
****************************************************************************
- qmake-manual
* 250370: Added documentation for ICON keyword