diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 01:11:52 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 01:11:52 +1000 |
commit | 6bd691dc5402f22840a3354b08cb6bdc99b01006 (patch) | |
tree | 6ef3847a93f501d52fcb01927c6c9f36a94570e5 /config.profiles/harmattan/manpages/qtconfig.1 | |
parent | e60f05201f5bc412ec8c02625bcbbca5ba50812c (diff) | |
parent | 4d10065c54f9b277f44ed042f4e18858dafdd1df (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (21 commits)
Fixed line endings.
Update licenseheader text in source files for qtbase Qt module
New configure.exe binary
Add -qpa option on Windows
Use qglobal.h's VERSION number instead of hardcoded current version
More examples adjusted to Symbian and Maemo5. (cherry picked from commit a97b9620a584c9b1a2e006873183526b3d7e001e)
Doc: Added some details to the accessibility events API documentation.
Doc: Fixed qdoc warnings.
Doc: Fixed qdoc warnings.
Doc: Made an additional change for clarity.
Doc: Noted that the example will not work as expected with a mouse.
Doc: Fixed qdoc warnings.
Doc: Applying a pending change from previous merges.
Doc: Fixed qdoc warning.
Doc: Fixed qdoc warnings.
Doc: Applied pending fixes to API documentation.
Doc: Various fixes to documentation, some based on changes in master.
Doc: Added missing project and desktop files.
Doc: Documented the value returned when no field can be found.
Squashed commit of changes from the 4.8-temp branch.
...
Diffstat (limited to 'config.profiles/harmattan/manpages/qtconfig.1')
-rw-r--r-- | config.profiles/harmattan/manpages/qtconfig.1 | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/config.profiles/harmattan/manpages/qtconfig.1 b/config.profiles/harmattan/manpages/qtconfig.1 index 854c88fff7..977c357fbe 100644 --- a/config.profiles/harmattan/manpages/qtconfig.1 +++ b/config.profiles/harmattan/manpages/qtconfig.1 @@ -7,29 +7,29 @@ .\" This file is part of the QtGui module of the Qt Toolkit. .\" .\" $QT_BEGIN_LICENSE:LGPL$ -.\" No Commercial Usage -.\" This file contains pre-release code and may not be distributed. -.\" You may use this file in accordance with the terms and conditions -.\" contained in the Technology Preview License Agreement accompanying -.\" this package. -.\" .\" GNU Lesser General Public License Usage -.\" Alternatively, this file may be used under the terms of the GNU Lesser -.\" General Public License version 2.1 as published by the Free Software -.\" Foundation and appearing in the file LICENSE.LGPL included in the -.\" packaging of this file. Please review the following information to -.\" ensure the GNU Lesser General Public License version 2.1 requirements -.\" will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +.\" This file may be used under the terms of the GNU Lesser General Public +.\" License version 2.1 as published by the Free Software Foundation and +.\" appearing in the file LICENSE.LGPL included in the packaging of this +.\" file. Please review the following information to ensure the GNU Lesser +.\" General Public License version 2.1 requirements will be met: +.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. .\" .\" In addition, as a special exception, Nokia gives you certain additional -.\" rights. These rights are described in the Nokia Qt LGPL Exception +.\" rights. These rights are described in the Nokia Qt LGPL Exception .\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package. .\" -.\" If you have questions regarding the use of this file, please contact -.\" Nokia at qt-info@nokia.com. -.\" -.\" +.\" GNU General Public License Usage +.\" Alternatively, this file may be used under the terms of the GNU General +.\" Public License version 3.0 as published by the Free Software Foundation +.\" and appearing in the file LICENSE.GPL included in the packaging of this +.\" file. Please review the following information to ensure the GNU General +.\" Public License version 3.0 requirements will be met: +.\" http://www.gnu.org/copyleft/gpl.html. .\" +.\" Other Usage +.\" Alternatively, this file may be used in accordance with the terms and +.\" conditions contained in a signed written agreement between you and Nokia. .\" .\" .\" |