summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qsound_mac.mm
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-06-16 12:08:09 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-06-16 12:08:09 (GMT)
commit858c70f768eeb2d65cefd4115f4e9089b588b2d0 (patch)
treeae24d25b16318a3c479c30096985f4aac4bd2ff3 /src/gui/kernel/qsound_mac.mm
parent7f00209fe9face275e068d889973aa943cdfcb00 (diff)
downloadQt-858c70f768eeb2d65cefd4115f4e9089b588b2d0.zip
Qt-858c70f768eeb2d65cefd4115f4e9089b588b2d0.tar.gz
Qt-858c70f768eeb2d65cefd4115f4e9089b588b2d0.tar.bz2
Update license headers as requested by the marketing department.
Reviewed-by: Trust Me
Diffstat (limited to 'src/gui/kernel/qsound_mac.mm')
-rw-r--r--src/gui/kernel/qsound_mac.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qsound_mac.mm b/src/gui/kernel/qsound_mac.mm
index a58d48b..43965d1 100644
--- a/src/gui/kernel/qsound_mac.mm
+++ b/src/gui/kernel/qsound_mac.mm
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtGui module of the Qt Toolkit.
**
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
s='column5'>| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1b5004c1a Autogen: Fix empty uic executable string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2667 | * | | | | | | | | | | | | | | | | | | | Autogen: Fix empty uic executable stringSebastian Holtermann2018-11-271-1/+1 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CMake 3.13.0 when a target has ``AUTOUIC`` enabled but doesn't link against Qt5Widgets, the uic executable string is empty and an error string "The uic executable \"\" does not exist" is generated. In CMake 3.12 ``AUTOUIC`` was silently disabled instead. This patch fixes the regression and restores the behavior of CMake 3.12. Fixes: #18630 * | | | | | | | | | | | | | | | | | | | | Merge topic 'doc-cmake.1'Craig Scott2018-11-288-68/+226 |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e15cac8ee7 Help: Extend the cmake(1) manual 8b3a537c29 Help: Improve cmake(1) manual organization f9c3f7b164 Help: Emphasize tool names in their manuals Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2662 | * | | | | | | | | | | | | | | | | | | | | Help: Extend the cmake(1) manualBrad King2018-11-272-21/+120 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the description section to cover all capabilities that the "cmake" tool has. Extend the buildsystem generation section to introduce important concepts and describe the basic workflow. Inspired-by: Joachim Wuttke (l) <j.wuttke@fz-juelich.de> | * | | | | | | | | | | | | | | | | | | | | Help: Improve cmake(1) manual organizationJoachim Wuttke (l)2018-11-273-53/+112 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the Synposis, and provide links to manual sections. Add sections for `cmake --open` and `cmake --help-*`. Introduce a new section for buildsystem generation to distinguish it from the other functionality. Populate it with minimal placeholder text for now. It will be extended later. Co-Author: Brad King <brad.king@kitware.com> | * | | | | | | | | | | | | | | | | | | | | Help: Emphasize tool names in their manualsJoachim Wuttke (l)2018-11-265-8/+8 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print the name of the **cmake** executable in boldface, so that it does not appear less prominent than other shell commands (which are underlaid with links). Similarly the other tool manuals. * | | | | | | | | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-11-281-1/+1 | |_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | Merge topic 'autogen_target_docs'Brad King2018-11-273-25/+44 |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d80977af4 Autogen: Documentation updates Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2659 | * | | | | | | | | | | | | | | | | | | | | Autogen: Documentation updatesSebastian Holtermann2018-11-263-25/+44 | | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extends the documentation for - :prop_tgt:`AUTOGEN_ORIGIN_DEPENDS` - :prop_tgt:`AUTOGEN_TARGET_DEPENDS` - :variable:`CMAKE_GLOBAL_AUTOGEN_TARGET` * | | | | | | | | | | | | | | | | | | | | Merge topic 'FindDoxygen-win-glob'Brad King2018-11-271-7/+12 |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85a035bf00 FindDoxygen: Avoid Windows-specific GLOB on other platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2660 | * | | | | | | | | | | | | | | | | | | | | FindDoxygen: Avoid Windows-specific GLOB on other platformsNoel Eck2018-11-261-7/+12 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `$ENV{ProgramFiles}` is empty, GLOB takes `/Graphviz*/bin` as a path cusing the implementation to look at every directory in `/`. If the system has a slow(er) path mounted on '/' then `stat` call can take some time. There *may* be a better fix for this elsewhere, but for now simply do this GLOB only on Windows. Signed-off-by: Noel Eck <noel.eck@intel.com> * | | | | | | | | | | | | | | | | | | | | | Merge topic 'ctest-updates'Brad King2018-11-27