Merge remote-tracking branch 'mainline/4.8'

1 files changed, 22 insertions, 22 deletions

diff --git a/src/gui/embedded/qwslock.cpp b/src/gui/embedded/qwslock.cpp
index 324d813..a64dc3d 100644
--- a/src/gui/embedded/qwslock.cpp
+++ b/src/gui/embedded/qwslock.cpp
@@ -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.
 **
 **
 **
@@ -114,7 +114,7 @@ QWSLock::~QWSLock()
     QWSSignalHandler::instance()->removeSemaphore(semId);
 }
 
-static bool forceLock(int semId, int semNum, int)
+static bool forceLock(int semId, unsigned short semNum, int)
 {
     int ret;
     do {
@@ -135,7 +135,7 @@ static bool forceLock(int semId, int semNum, int)
     return (ret != -1);
 }
 
-static bool up(int semId, int semNum)
+static bool up(int semId, unsigned short semNum)
 {
     int ret;
     do {
@@ -148,7 +148,7 @@ static bool up(int semId, int semNum)
     return (ret != -1);
 }
 
-static bool down(int semId, int semNum)
+static bool down(int semId, unsigned short semNum)
 {
     int ret;
     do {
@@ -161,7 +161,7 @@ static bool down(int semId, int semNum)
     return (ret != -1);
 }
 
-static int getValue(int semId, int semNum)
+static int getValue(int semId, unsigned short semNum)
 {
     int ret;
     do {
@@ -210,7 +210,7 @@ void QWSLock::unlock(LockType type)
             return;
     }
 
-    const int semNum = type;
+    const unsigned short semNum = type;
     int ret;
     do {
         sembuf sops = {semNum, 1, 0};