summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-01-12 17:56:45 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-01-12 17:56:45 (GMT)
commit22796b38c3a7dbcdb540e4c58e645b0267fe360c (patch)
treedab9604e944d0184249ac2dceca7b6b16adba39e /dist
parentb958102dfa36a3554911adb8fdb21375f0ecb48c (diff)
parentbf71ab63e805e49e59fbe25265104a414ab7d039 (diff)
downloadQt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.zip
Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.tar.gz
Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.tar.bz2
Merge branch '4.6'
Diffstat (limited to 'dist')
-rw-r--r--dist/README4
-rw-r--r--dist/changes-4.6.12
2 files changed, 6 insertions, 0 deletions
diff --git a/dist/README b/dist/README
index e7dfb19..73c8be1 100644
--- a/dist/README
+++ b/dist/README
@@ -26,6 +26,10 @@ For Mac OS X Cocoa, the binary package requires Mac OS X 10.5 (Leopard) or
later and GCC 4.0.1 to develop applications. Its applications will run
on Mac OS X 10.5 and above.
+If you want to install the precompiled binary package for Symbian,
+follow these instructions:
+http://qt.nokia.com/doc/%SHORTVERSION%/install-symbian-installer.html
+
DEMOS AND EXAMPLES
diff --git a/dist/changes-4.6.1 b/dist/changes-4.6.1
index 2397228..145e09e 100644
--- a/dist/changes-4.6.1
+++ b/dist/changes-4.6.1
@@ -51,6 +51,8 @@ QtGui
in the DDS, ETC1, PVRTC2, and PVRTC4 formats if the OpenGL graphics
system is active and the appropriate extensions are present in the
GL implementation.
+ - QGraphicsObject
+ * 'id' property was removed. Use the 'objectName' property instead.
QtDBus
------