summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-16 01:22:45 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-16 01:22:45 +0100
commit7075e291998612a3c0a530bb37a515dd07739e28 (patch)
tree4e1992498d82ee3f6f92fd6d42754c92928dd581 /dist
parent1161a8a62907796ea45b1877bec31e66aeef77f6 (diff)
parent3d9a40038f01bc2a3df0027a9be04e7fa3ce3850 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Conflicts: src/widgets/styles/qstyleanimation.cpp Change-Id: Iae570895be6544de80f9c1ec309d1a08c59daff8
Diffstat (limited to 'dist')
-rw-r--r--dist/README5
-rw-r--r--dist/changes-5.0.15
2 files changed, 5 insertions, 5 deletions
diff --git a/dist/README b/dist/README
index d9eed68fb7..19443c1bbe 100644
--- a/dist/README
+++ b/dist/README
@@ -152,8 +152,3 @@ Much more information is available at:
We hope you will enjoy using Qt!
- The Qt developers @ qt-project.org
-
-
-
- In memory of Trond Kjernåsen.
- You will not be forgotten. \ No newline at end of file
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
index 479ac344ce..e73776185d 100644
--- a/dist/changes-5.0.1
+++ b/dist/changes-5.0.1
@@ -98,6 +98,7 @@ Qt for Windows CE
* Compiler Specific Changes *
****************************************************************************
+ - MinGW: Statically link runtime libraries into qmake
****************************************************************************
* Tools *
@@ -113,3 +114,7 @@ Qt for Windows CE
* Important Behavior Changes *
****************************************************************************
+- QSharedMemory on Unix systems now no longer creates shared memory
+ segments that are readable and writeable to everyone. From Qt 5.0.1
+ forward, the segments are created readable and writeable only by the
+ current user. This matches the behavior on Windows.