diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-03 14:20:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 11:12:05 +0100 |
| commit | ca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch) | |
| tree | b9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /dist/README | |
| parent | 28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff) | |
| parent | 83188c6499ccdc87c0a2c468bb497e287f5db369 (diff) | |
Merge branch 'stable' into dev
Conflicts:
examples/widgets/painting/shared/shared.pri
src/corelib/tools/qharfbuzz_p.h
src/corelib/tools/qunicodetools.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'dist/README')
| -rw-r--r-- | dist/README | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dist/README b/dist/README index 2828cf1b37..d9eed68fb7 100644 --- a/dist/README +++ b/dist/README @@ -91,10 +91,6 @@ Running Example Applications You can open example applications in the Qt Creator Welcome mode to build and run them. -Ready to run example applications are located in -<install_dir>/<version>/<compiler>/examples. You can launch the C++ based -examples directly either from command line or your file system browser. - The QML based Quick 2 examples are located in <install_dir>/<version>/<compiler>/examples/qtdeclarative. You can load them using the qmlscene application. @@ -156,3 +152,8 @@ 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 |